From 21ca06dacefaabbba57075bbdde61e8c307c3fa1 Mon Sep 17 00:00:00 2001
From: Max Medvedev <maxim.medvedev@jetbrains.com>
Date: Tue, 19 Jun 2018 11:59:14 +0300
Subject: [PATCH] KT-22333 Extract function: make name editor focused once
 again

---
 .../extractFunction/ui/KotlinExtractFunctionDialog.java       | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractFunction/ui/KotlinExtractFunctionDialog.java b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractFunction/ui/KotlinExtractFunctionDialog.java
index 7977c582dab..56aec13f089 100644
--- a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractFunction/ui/KotlinExtractFunctionDialog.java
+++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractFunction/ui/KotlinExtractFunctionDialog.java
@@ -213,8 +213,6 @@ public class KotlinExtractFunctionDialog extends DialogWrapper {
         inputParametersPanel.setText("&Parameters");
         inputParametersPanel.setLabelFor(parameterTablePanel.getTable());
         inputParametersPanel.add(parameterTablePanel);
-
-        functionNameField.requestFocus();
     }
 
     @SuppressWarnings("SuspiciousMethodCalls")
@@ -245,7 +243,7 @@ public class KotlinExtractFunctionDialog extends DialogWrapper {
 
     @Override
     public JComponent getPreferredFocusedComponent() {
-        return functionNameField;
+        return functionNameField.getFocusableComponent();
     }
 
     @Override