diff --git a/editor.macros/src/org/netbeans/modules/editor/macros/storage/ui/MacrosPanel.form b/editor.macros/src/org/netbeans/modules/editor/macros/storage/ui/MacrosPanel.form
--- a/editor.macros/src/org/netbeans/modules/editor/macros/storage/ui/MacrosPanel.form
+++ b/editor.macros/src/org/netbeans/modules/editor/macros/storage/ui/MacrosPanel.form
@@ -9,6 +9,9 @@
       <ResourceString bundle="org/netbeans/modules/editor/macros/storage/ui/Bundle.properties" key="AD_MacrosPanel" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
     </Property>
   </AccessibilityProperties>
+  <SyntheticProperties>
+    <SyntheticProperty name="designerSize" type="java.awt.Dimension" value="-84,-19,0,5,115,114,0,18,106,97,118,97,46,97,119,116,46,68,105,109,101,110,115,105,111,110,65,-114,-39,-41,-84,95,68,20,2,0,2,73,0,6,104,101,105,103,104,116,73,0,5,119,105,100,116,104,120,112,0,0,1,50,0,0,1,-26"/>
+  </SyntheticProperties>
   <AuxValues>
     <AuxValue name="FormSettings_autoResourcing" type="java.lang.Integer" value="0"/>
     <AuxValue name="FormSettings_autoSetComponentName" type="java.lang.Boolean" value="false"/>
diff --git a/editor.macros/src/org/netbeans/modules/editor/macros/storage/ui/MacrosPanel.java b/editor.macros/src/org/netbeans/modules/editor/macros/storage/ui/MacrosPanel.java
--- a/editor.macros/src/org/netbeans/modules/editor/macros/storage/ui/MacrosPanel.java
+++ b/editor.macros/src/org/netbeans/modules/editor/macros/storage/ui/MacrosPanel.java
@@ -42,6 +42,8 @@
 
 import java.awt.Color;
 import java.awt.Component;
+import java.awt.event.KeyAdapter;
+import java.awt.event.KeyEvent;
 import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
@@ -114,6 +116,17 @@
                 tMacrosTableChanged(evt);
             }
         });
+
+        // Fix for #135985
+        tMacros.addKeyListener(new KeyAdapter() {
+            @Override
+            public void keyPressed(KeyEvent e) {
+                if( KeyEvent.VK_ENTER == e.getKeyCode()) {
+                    epMacroCode.requestFocusInWindow();
+                    e.consume();
+                }
+            }
+        });
         
         epMacroCode.setEnabled(false);
         epMacroCode.setEditorKit(JEditorPane.createEditorKitForContentType("text/plain")); //NOI18N
@@ -311,7 +324,8 @@
             epMacroCode.setText(model.getMacroByIndex(index).getCode()); //NOI18N
             epMacroCode.getCaret().setDot(0);
             epMacroCode.setEnabled(true);
-            epMacroCode.requestFocusInWindow();
+            // Fix for #135985 commented to avoid focus
+            //epMacroCode.requestFocusInWindow();
             bRemove.setEnabled(true);
             bSetShortcut.setEnabled(true);
         }