diff --git a/CHANGELOG.md b/CHANGELOG.md
index e0d99bdb1..cb9000793 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,6 +15,7 @@ All notable changes to this project will be documented in this file.
 - AS3 p-code/AS hilighting after p-code save
 - Decompilation - Goto handling
 - Not selecting proper script after restoring session
+- #1603 empty script after search selection
 
 ### Removed
 - #1631 ActiveX Flash component download in windows installer
diff --git a/src/com/jpexs/decompiler/flash/gui/abc/ABCPanel.java b/src/com/jpexs/decompiler/flash/gui/abc/ABCPanel.java
index bcf3241a7..f6a498d17 100644
--- a/src/com/jpexs/decompiler/flash/gui/abc/ABCPanel.java
+++ b/src/com/jpexs/decompiler/flash/gui/abc/ABCPanel.java
@@ -883,6 +883,12 @@ public class ABCPanel extends JPanel implements ItemListener, SearchListener<Scr
                 return decompiledTextArea.linkPainter();
             }
         });
+        decompiledTextArea.addScriptListener(new Runnable() {
+            @Override
+            public void run() {
+                lastDecompiled = decompiledTextArea.getText();
+            }
+        });
 
         // Register the component on the tooltip manager
         // So that #getToolTipText(MouseEvent) gets invoked when the mouse
@@ -1353,13 +1359,13 @@ public class ABCPanel extends JPanel implements ItemListener, SearchListener<Scr
         searchPanel.setOptions(ignoreCase, regExp);
         searchPanel.setSearchText(searchedText);
         ScriptPack pack = result.getScriptPack();
-        setAbc(pack.abc);
 
         Runnable setScriptComplete = new Runnable() {
             @Override
             public void run() {
                 decompiledTextArea.removeScriptListener(this);
                 hilightScript(pack);
+                setAbc(pack.abc);
 
                 boolean pcode = result.isPcode();
                 if (pcode) {