diff --git a/idea/src/META-INF/plugin.xml b/idea/src/META-INF/plugin.xml
index f6e6c284a0a..8baa836d37e 100644
--- a/idea/src/META-INF/plugin.xml
+++ b/idea/src/META-INF/plugin.xml
@@ -111,6 +111,7 @@
       <lang.findUsagesProvider language="jet" implementationClass="org.jetbrains.jet.plugin.findUsages.JetFindUsagesProvider"/>
       <importFilteringRule implementation="org.jetbrains.jet.plugin.findUsages.JetImportFilteringRule"/>
       <lang.refactoringSupport language="jet" implementationClass="org.jetbrains.jet.plugin.refactoring.JetRefactoringSupportProvider"/>
+      <lang.surroundDescriptor language="jet" implementationClass="org.jetbrains.jet.plugin.codeInsight.surroundWith.KotlinExpressionSurroundDescriptor"/>
       <quoteHandler fileType="Kotlin" className="org.jetbrains.jet.plugin.editor.KotlinQuoteHandler"/>
       <refactoring.moveHandler implementation="org.jetbrains.jet.plugin.refactoring.move.JetMoveFilesOrDirectoriesHandler"/>
       <refactoring.copyHandler implementation="org.jetbrains.jet.plugin.refactoring.copy.JetCopyClassHandler"/>
diff --git a/idea/src/org/jetbrains/jet/plugin/codeInsight/surroundWith/KotlinExpressionSurroundDescriptor.java b/idea/src/org/jetbrains/jet/plugin/codeInsight/surroundWith/KotlinExpressionSurroundDescriptor.java
new file mode 100644
index 00000000000..293189b94a3
--- /dev/null
+++ b/idea/src/org/jetbrains/jet/plugin/codeInsight/surroundWith/KotlinExpressionSurroundDescriptor.java
@@ -0,0 +1,57 @@
+/*
+ * Copyright 2010-2013 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.jetbrains.jet.plugin.codeInsight.surroundWith;
+
+import com.intellij.lang.surroundWith.SurroundDescriptor;
+import com.intellij.lang.surroundWith.Surrounder;
+import com.intellij.psi.PsiElement;
+import com.intellij.psi.PsiFile;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.jet.lang.psi.JetExpression;
+import org.jetbrains.jet.plugin.refactoring.JetRefactoringUtil;
+
+public class KotlinExpressionSurroundDescriptor implements SurroundDescriptor {
+
+    private static final Surrounder[] SURROUNDERS = {
+
+    };
+
+    @NotNull
+    public PsiElement[] getElementsToSurround(PsiFile file, int startOffset, int endOffset) {
+        try {
+            JetExpression expression = JetRefactoringUtil.findExpression(file, startOffset, endOffset);
+            if (expression == null) {
+                return PsiElement.EMPTY_ARRAY;
+            }
+            return new PsiElement[] {expression};
+        }
+        catch (JetRefactoringUtil.IntroduceRefactoringException e) {
+            // Cannot find expression in this file with given offset
+            return PsiElement.EMPTY_ARRAY;
+        }
+    }
+
+    @NotNull
+    public Surrounder[] getSurrounders() {
+        return SURROUNDERS;
+    }
+
+    @Override
+    public boolean isExclusive() {
+        return false;
+    }
+}