diff --git a/CHANGELOG.md b/CHANGELOG.md
index 71a5d57d8..f997cbc6f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,7 +12,7 @@ All notable changes to this project will be documented in this file.
 - AS3: Incorrect handling of strict equals operator in if vs switch resulting in §§pop
 - Better goto detection/for continue
 - Support for comma operator in switch case statements
-- AS3: Losing script tree focus on script selection (disallowed walking tree with keyboard up/down)
+- Losing script tree focus on script selection (disallowed walking tree with keyboard up/down)
 - Proper window screen centering
 - Graph dialog proper window size
 - Graph dialog scroll speed increased
diff --git a/src/com/jpexs/decompiler/flash/gui/abc/ABCPanel.java b/src/com/jpexs/decompiler/flash/gui/abc/ABCPanel.java
index e373e3174..5494c8ef9 100644
--- a/src/com/jpexs/decompiler/flash/gui/abc/ABCPanel.java
+++ b/src/com/jpexs/decompiler/flash/gui/abc/ABCPanel.java
@@ -1393,8 +1393,9 @@ public class ABCPanel extends JPanel implements ItemListener, SearchListener<ABC
         detailPanel.setVisible(!val);
 
         decompiledTextArea.ignoreCarret = val;
-        //This prevents walking script tree with up and down:
-        //decompiledTextArea.requestFocusInWindow();
+        if (val) {
+            decompiledTextArea.requestFocusInWindow();
+        }
     }
 
     private void editDecompiledButtonActionPerformed(ActionEvent evt) {
diff --git a/src/com/jpexs/decompiler/flash/gui/action/ActionPanel.java b/src/com/jpexs/decompiler/flash/gui/action/ActionPanel.java
index a76090dec..cc0583ac9 100644
--- a/src/com/jpexs/decompiler/flash/gui/action/ActionPanel.java
+++ b/src/com/jpexs/decompiler/flash/gui/action/ActionPanel.java
@@ -933,7 +933,9 @@ public class ActionPanel extends JPanel implements SearchListener<ActionSearchRe
         asmLabel.setIcon(val ? View.getIcon("editing16") : null); // this line is not working
         topButtonsPan.setVisible(!val);
         editMode = val;
-        editor.requestFocusInWindow();
+        if (val) {
+            editor.requestFocusInWindow();
+        }
     }
 
     public void setDecompiledEditMode(boolean val) {
@@ -968,7 +970,9 @@ public class ActionPanel extends JPanel implements SearchListener<ActionSearchRe
         decompiledEditor.getCaret().setVisible(true);
         decLabel.setIcon(val ? View.getIcon("editing16") : null);
         editDecompiledMode = val;
-        decompiledEditor.requestFocusInWindow();
+        if (val) {
+            decompiledEditor.requestFocusInWindow();
+        }
     }
 
     private void graphButtonActionPerformed(ActionEvent evt) {