diff --git a/platform/lang-impl/src/com/intellij/application/options/schemes/AbstractDescriptionAwareSchemesPanel.java b/platform/lang-impl/src/com/intellij/application/options/schemes/AbstractDescriptionAwareSchemesPanel.java
index f3394c839d22..8b106eef89f9 100644
--- a/platform/lang-impl/src/com/intellij/application/options/schemes/AbstractDescriptionAwareSchemesPanel.java
+++ b/platform/lang-impl/src/com/intellij/application/options/schemes/AbstractDescriptionAwareSchemesPanel.java
@@ -59,13 +59,15 @@ public abstract class AbstractDescriptionAwareSchemesPanel<T extends Scheme> ext
     myDescriptionTextField.registerKeyboardAction(new ActionListener() {
       @Override
       public void actionPerformed(ActionEvent e) {
-        applyDescription();
+        showDescription();
+        getConfigurableFocusComponent().requestFocus();
       }
     }, ESC_KEY_STROKE, JComponent.WHEN_FOCUSED);
     myDescriptionTextField.registerKeyboardAction(new ActionListener() {
       @Override
       public void actionPerformed(ActionEvent e) {
-        showDescription();
+        applyDescription();
+        getConfigurableFocusComponent().requestFocus();
       }
     }, ENTER_KEY_STROKE, JComponent.WHEN_FOCUSED);
 
@@ -123,6 +125,9 @@ public abstract class AbstractDescriptionAwareSchemesPanel<T extends Scheme> ext
     myDescriptionTextField.requestFocus();
   }
 
+  @NotNull
+  protected abstract JComponent getConfigurableFocusComponent();
+
   private void applyDescription() {
     (((DescriptionAwareSchemeActions<T>)getActions())).setDescription(getSelectedScheme(), myDescriptionTextField.getText());
     showDescription();
diff --git a/platform/lang-impl/src/com/intellij/profile/codeInspection/ui/header/InspectionProfileSchemesPanel.java b/platform/lang-impl/src/com/intellij/profile/codeInspection/ui/header/InspectionProfileSchemesPanel.java
index f2e93ba3cb16..712fd5c342c6 100644
--- a/platform/lang-impl/src/com/intellij/profile/codeInspection/ui/header/InspectionProfileSchemesPanel.java
+++ b/platform/lang-impl/src/com/intellij/profile/codeInspection/ui/header/InspectionProfileSchemesPanel.java
@@ -42,6 +42,7 @@ import org.jdom.JDOMException;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+import javax.swing.*;
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -275,4 +276,10 @@ public class InspectionProfileSchemesPanel extends AbstractDescriptionAwareSchem
     getModel().updatePanel(this);
     selectScheme(selected);
   }
+
+  @NotNull
+  @Override
+  protected JComponent getConfigurableFocusComponent() {
+    return myConfigurable.getPreferredFocusedComponent();
+  }
 }