diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/search/ABCSearchResult.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/search/ABCSearchResult.java
index 9b1b5ac63..5ca608510 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/search/ABCSearchResult.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/search/ABCSearchResult.java
@@ -63,6 +63,10 @@ public class ABCSearchResult {
         return pcode;
     }
 
+    public int getClassIndex() {
+        return classIndex;
+    }
+
     public int getTraitId() {
         return traitId;
     }
diff --git a/src/com/jpexs/decompiler/flash/gui/abc/ABCPanel.java b/src/com/jpexs/decompiler/flash/gui/abc/ABCPanel.java
index 298eac3fa..cc5fcf3bf 100644
--- a/src/com/jpexs/decompiler/flash/gui/abc/ABCPanel.java
+++ b/src/com/jpexs/decompiler/flash/gui/abc/ABCPanel.java
@@ -1252,6 +1252,7 @@ public class ABCPanel extends JPanel implements ItemListener, SearchListener<ABC
 
         boolean pcode = item.isPcode();
         if (pcode) {
+            decompiledTextArea.setClassIndex(item.getClassIndex());
             decompiledTextArea.gotoTrait(item.getTraitId());
         }