diff --git a/platform/lang-impl/src/com/intellij/execution/impl/RunConfigurable.java b/platform/lang-impl/src/com/intellij/execution/impl/RunConfigurable.java
index 7fb2b09c536a..d44a549341e8 100644
--- a/platform/lang-impl/src/com/intellij/execution/impl/RunConfigurable.java
+++ b/platform/lang-impl/src/com/intellij/execution/impl/RunConfigurable.java
@@ -353,6 +353,12 @@ class RunConfigurable extends BaseConfigurable {
         myTreeModel.reload(node);
       }
     });
+    textField.addActionListener(new ActionListener() {
+      @Override
+      public void actionPerformed(ActionEvent e) {
+        myTree.requestFocus();
+      }
+    });
     p.add(new JLabel("Folder name:"), "gapright 5");
     p.add(textField, "pushx, growx, wrap");
     p.add(new JLabel(ExecutionBundle.message("run.configuration.rename.folder.disclaimer")), "gaptop 5, spanx 2");