diff --git a/css.editor/src/org/netbeans/modules/css/refactoring/RenamePanel.java b/css.editor/src/org/netbeans/modules/css/refactoring/RenamePanel.java
--- a/css.editor/src/org/netbeans/modules/css/refactoring/RenamePanel.java
+++ b/css.editor/src/org/netbeans/modules/css/refactoring/RenamePanel.java
@@ -95,7 +95,15 @@
     public @Override void requestFocus() {
         nameField.requestFocus();
     }
-    
+
+    @Override
+    public boolean requestFocusInWindow() {
+      if(nameField.isEnabled()) {
+        nameField.requestFocusInWindow();
+      }
+      return true;
+    }
+
     /** This method is called from within the constructor to
      * initialize the form.
      * WARNING: Do NOT modify this code. The content of this method is
diff --git a/css.prep/src/org/netbeans/modules/css/prep/editor/refactoring/RenamePanel.java b/css.prep/src/org/netbeans/modules/css/prep/editor/refactoring/RenamePanel.java
--- a/css.prep/src/org/netbeans/modules/css/prep/editor/refactoring/RenamePanel.java
+++ b/css.prep/src/org/netbeans/modules/css/prep/editor/refactoring/RenamePanel.java
@@ -98,7 +98,15 @@
     public @Override void requestFocus() {
         nameField.requestFocus();
     }
-    
+
+    @Override
+    public boolean requestFocusInWindow() {
+      if(nameField.isEnabled()) {
+        nameField.requestFocusInWindow();
+      }
+      return true;
+    }
+
     /** This method is called from within the constructor to
      * initialize the form.
      * WARNING: Do NOT modify this code. The content of this method is
diff --git a/groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/ui/RenamePanel.java b/groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/ui/RenamePanel.java
--- a/groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/ui/RenamePanel.java
+++ b/groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/ui/RenamePanel.java
@@ -114,7 +114,15 @@
             textCheckBox.requestFocus();
         }
     }
-    
+
+    @Override
+    public boolean requestFocusInWindow() {
+      if(nameField.isEnabled()) {
+        nameField.requestFocusInWindow();
+      }
+      return true;
+    }
+
     /** This method is called from within the constructor to
      * initialize the form.
      * WARNING: Do NOT modify this code. The content of this method is
diff --git a/javascript.refactoring/src/org/netbeans/modules/refactoring/javascript/ui/RenamePanel.form b/javascript.refactoring/src/org/netbeans/modules/refactoring/javascript/ui/RenamePanel.form
--- a/javascript.refactoring/src/org/netbeans/modules/refactoring/javascript/ui/RenamePanel.form
+++ b/javascript.refactoring/src/org/netbeans/modules/refactoring/javascript/ui/RenamePanel.form
@@ -1,4 +1,4 @@
-<?xml version="1.1" encoding="UTF-8" ?>
+<?xml version="1.0" encoding="UTF-8" ?>
 
 <Form version="1.2" maxVersion="1.2" type="org.netbeans.modules.form.forminfo.JPanelFormInfo">
   <Properties>
diff --git a/javascript.refactoring/src/org/netbeans/modules/refactoring/javascript/ui/RenamePanel.java b/javascript.refactoring/src/org/netbeans/modules/refactoring/javascript/ui/RenamePanel.java
--- a/javascript.refactoring/src/org/netbeans/modules/refactoring/javascript/ui/RenamePanel.java
+++ b/javascript.refactoring/src/org/netbeans/modules/refactoring/javascript/ui/RenamePanel.java
@@ -96,7 +96,15 @@
     public @Override void requestFocus() {
         nameField.requestFocus();
     }
-    
+
+    @Override
+    public boolean requestFocusInWindow() {
+      if(nameField.isEnabled()) {
+        nameField.requestFocusInWindow();
+      }
+      return true;
+    }
+
     /** This method is called from within the constructor to
      * initialize the form.
      * WARNING: Do NOT modify this code. The content of this method is
diff --git a/languages.refactoring/src/org/netbeans/modules/languages/refactoring/RenamePanel.java b/languages.refactoring/src/org/netbeans/modules/languages/refactoring/RenamePanel.java
--- a/languages.refactoring/src/org/netbeans/modules/languages/refactoring/RenamePanel.java
+++ b/languages.refactoring/src/org/netbeans/modules/languages/refactoring/RenamePanel.java
@@ -95,6 +95,12 @@
     public void requestFocus() {
         nameField.requestFocus();
     }
+
+    @Override
+    public boolean requestFocusInWindow() {
+      nameField.requestFocusInWindow();
+      return true;
+    }
     
     /** This method is called from within the constructor to
      * initialize the form.
diff --git a/php.refactoring/src/org/netbeans/modules/refactoring/php/rename/RenamePanel.java b/php.refactoring/src/org/netbeans/modules/refactoring/php/rename/RenamePanel.java
--- a/php.refactoring/src/org/netbeans/modules/refactoring/php/rename/RenamePanel.java
+++ b/php.refactoring/src/org/netbeans/modules/refactoring/php/rename/RenamePanel.java
@@ -127,6 +127,14 @@
         nameField.requestFocus();
     }
 
+    @Override
+    public boolean requestFocusInWindow() {
+      if(nameField.isEnabled()) {
+        nameField.requestFocusInWindow();
+      }
+      return true;
+    }
+
     /** This method is called from within the constructor to
      * initialize the form.
      * WARNING: Do NOT modify this code. The content of this method is
diff --git a/projectui/src/org/netbeans/modules/project/ui/groups/GroupsMenu.java b/projectui/src/org/netbeans/modules/project/ui/groups/GroupsMenu.java
--- a/projectui/src/org/netbeans/modules/project/ui/groups/GroupsMenu.java
+++ b/projectui/src/org/netbeans/modules/project/ui/groups/GroupsMenu.java
@@ -65,7 +65,6 @@
 import org.openide.util.RequestProcessor;
 import static org.netbeans.modules.project.ui.groups.Bundle.*;
 import org.netbeans.modules.project.uiapi.BaseUtilities;
-import org.netbeans.modules.project.uiapi.Utilities;
 import org.netbeans.spi.project.ui.support.ProjectCustomizer;
 import org.openide.util.Lookup;
 import org.openide.util.lookup.Lookups;
diff --git a/vmd.midp/src/org/netbeans/modules/vmd/midp/codegen/ui/RenamePanel.java b/vmd.midp/src/org/netbeans/modules/vmd/midp/codegen/ui/RenamePanel.java
--- a/vmd.midp/src/org/netbeans/modules/vmd/midp/codegen/ui/RenamePanel.java
+++ b/vmd.midp/src/org/netbeans/modules/vmd/midp/codegen/ui/RenamePanel.java
@@ -107,7 +107,13 @@
         nameField.requestFocus();
     }
 
-        public String getNameValue() {
+    @Override
+    public boolean requestFocusInWindow() {
+      nameField.requestFocusInWindow();
+      return true;
+    }
+
+    public String getNameValue() {
         return nameField.getText();
     }
 
diff --git a/web.common/src/org/netbeans/modules/web/common/refactoring/RenamePanel.java b/web.common/src/org/netbeans/modules/web/common/refactoring/RenamePanel.java
--- a/web.common/src/org/netbeans/modules/web/common/refactoring/RenamePanel.java
+++ b/web.common/src/org/netbeans/modules/web/common/refactoring/RenamePanel.java
@@ -102,6 +102,11 @@
         nameField.requestFocus();
     }
 
+    @Override
+    public boolean requestFocusInWindow() {
+      nameField.requestFocusInWindow();
+      return true;
+    }
     /** This method is called from within the constructor to
      * initialize the form.
      * WARNING: Do NOT modify this code. The content of this method is