diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9f621451a..1ea283481 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -21,6 +21,7 @@ All notable changes to this project will be documented in this file.
 - #1603 empty script after search selection
 - Generic tag tree exception on save
 - Copying to clipboard does not support transparency
+- #1634 AS3 slot/const editor loses focus on edit button press
 
 ### Removed
 - #1631 ActiveX Flash component download in windows installer
diff --git a/src/com/jpexs/decompiler/flash/gui/abc/SlotConstTraitDetailPanel.java b/src/com/jpexs/decompiler/flash/gui/abc/SlotConstTraitDetailPanel.java
index 9f3e34c34..4e074536f 100644
--- a/src/com/jpexs/decompiler/flash/gui/abc/SlotConstTraitDetailPanel.java
+++ b/src/com/jpexs/decompiler/flash/gui/abc/SlotConstTraitDetailPanel.java
@@ -134,6 +134,9 @@ public class SlotConstTraitDetailPanel extends JPanel implements TraitDetail {
             View.showMessageDialog(null, AppStrings.translate("warning.initializers"), AppStrings.translate("message.warning"), JOptionPane.WARNING_MESSAGE, Configuration.warningInitializers);
         }
         slotConstEditor.setEditable(val);
+        if (val) {
+            slotConstEditor.requestFocusInWindow();
+        }
     }
 
     private boolean active = false;