diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3a8ccc899..c51ee2108 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -23,6 +23,7 @@ All notable changes to this project will be documented in this file.
 - Generic tag tree exception on save
 - Copying to clipboard does not support transparency
 - #1634 AS3 slot/const editor loses focus on edit button press
+- #1636 Exception after search - traitslist with not properly set abc, other ui exception
 
 ### 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 f6a498d17..730d7b230 100644
--- a/src/com/jpexs/decompiler/flash/gui/abc/ABCPanel.java
+++ b/src/com/jpexs/decompiler/flash/gui/abc/ABCPanel.java
@@ -1359,6 +1359,7 @@ 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
diff --git a/src/com/jpexs/decompiler/flash/gui/editor/LineMarkedEditorPane.java b/src/com/jpexs/decompiler/flash/gui/editor/LineMarkedEditorPane.java
index 714b4e0d3..76a3e1598 100644
--- a/src/com/jpexs/decompiler/flash/gui/editor/LineMarkedEditorPane.java
+++ b/src/com/jpexs/decompiler/flash/gui/editor/LineMarkedEditorPane.java
@@ -671,7 +671,11 @@ public class LineMarkedEditorPane extends UndoFixedEditorPane implements LinkHan
             line += firstLineOffset();
             g.fillRect(0, d + lh * (line - 1), getWidth(), lh);
         }
-        super.paint(g);
+        try {
+            super.paint(g);
+        } catch (Exception ex) {
+            //ignore
+        }
         for (int line : lineMarkers.keySet()) {
 
             SortedSet<LineMarker> cs = lineMarkers.get(line);