diff --git a/idea/src/META-INF/plugin.xml b/idea/src/META-INF/plugin.xml
index 506969f042d..9f430dce052 100644
--- a/idea/src/META-INF/plugin.xml
+++ b/idea/src/META-INF/plugin.xml
@@ -601,7 +601,7 @@
 
     <applicationService serviceInterface="org.jetbrains.kotlin.idea.editor.KotlinEditorOptions"
                         serviceImplementation="org.jetbrains.kotlin.idea.editor.KotlinEditorOptions"/>
-    <editorAppearanceConfigurable instance="org.jetbrains.kotlin.idea.editor.KotlinEditorOptionsConfigurable"/>
+    <editorSmartKeysConfigurable instance="org.jetbrains.kotlin.idea.editor.KotlinEditorOptionsConfigurable"/>
 
     <statementUpDownMover id="jetExpression"
                           implementation="org.jetbrains.kotlin.idea.codeInsight.upDownMover.KotlinExpressionMover"
diff --git a/idea/src/org/jetbrains/kotlin/idea/editor/KotlinEditorOptionsConfigurable.java b/idea/src/org/jetbrains/kotlin/idea/editor/KotlinEditorOptionsConfigurable.java
index 2d20cab33a0..88a2cf220a7 100644
--- a/idea/src/org/jetbrains/kotlin/idea/editor/KotlinEditorOptionsConfigurable.java
+++ b/idea/src/org/jetbrains/kotlin/idea/editor/KotlinEditorOptionsConfigurable.java
@@ -18,11 +18,21 @@ package org.jetbrains.kotlin.idea.editor;
 
 import com.intellij.openapi.options.BeanConfigurable;
 import com.intellij.openapi.options.UnnamedConfigurable;
+import com.intellij.ui.IdeBorderFactory;
+
+import javax.swing.*;
 
 public class KotlinEditorOptionsConfigurable extends BeanConfigurable<KotlinEditorOptions> implements UnnamedConfigurable {
     public KotlinEditorOptionsConfigurable() {
         super(KotlinEditorOptions.getInstance());
-        checkBox("enableJavaToKotlinConversion", "Enable Java To Kotlin Conversion");
-        checkBox("donTShowConversionDialog", "Don't show Java to Kotlin conversion dialog");
+        checkBox("enableJavaToKotlinConversion", "Convert pasted Java code to Kotlin");
+        checkBox("donTShowConversionDialog", "Don't show Java to Kotlin conversion dialog on paste");
+    }
+
+    @Override
+    public JComponent createComponent() {
+        JComponent component = super.createComponent();
+        component.setBorder(IdeBorderFactory.createTitledBorder("Kotlin"));
+        return component;
     }
 }