diff --git a/src/com/jpexs/decompiler/flash/gui/abc/ABCPanel.java b/src/com/jpexs/decompiler/flash/gui/abc/ABCPanel.java
index 89953c541..8c812ccdb 100644
--- a/src/com/jpexs/decompiler/flash/gui/abc/ABCPanel.java
+++ b/src/com/jpexs/decompiler/flash/gui/abc/ABCPanel.java
@@ -182,6 +182,12 @@ public class ABCPanel extends JPanel implements ItemListener, SearchListener<ABC
     }
 
     public List<ABCPanelSearchResult> search(final String txt, boolean ignoreCase, boolean regexp, CancellableWorker<Void> worker) {
+        List<String> ignoredClasses = new ArrayList<>();
+        List<String> ignoredNss = new ArrayList<>();
+
+        if (Configuration._ignoreAdditionalFlexClasses.get()) {
+            abc.getSwf().getFlexMainClass(ignoredClasses, ignoredNss);
+        }
         if (txt != null && !txt.isEmpty()) {
             searchPanel.setOptions(ignoreCase, regexp);
             TagTreeModel ttm = (TagTreeModel) mainPanel.tagTree.getModel();
@@ -194,11 +200,24 @@ public class ABCPanel extends JPanel implements ItemListener, SearchListener<ABC
                         ? Pattern.compile(txt, ignoreCase ? (Pattern.CASE_INSENSITIVE | Pattern.UNICODE_CASE) : 0)
                         : Pattern.compile(Pattern.quote(txt), ignoreCase ? (Pattern.CASE_INSENSITIVE | Pattern.UNICODE_CASE) : 0);
                 int pos = 0;
+                loop:
                 for (final ScriptPack pack : allpacks) {
                     pos++;
                     if (!pack.isSimple && Configuration.ignoreCLikePackages.get()) {
                         continue;
                     }
+                    if (Configuration._ignoreAdditionalFlexClasses.get()) {
+                        String fullName = pack.getClassPath().packageStr.add(pack.getClassPath().className).toRawString();
+                        if (ignoredClasses.contains(fullName)) {
+                            continue;
+                        }
+                        for (String ns : ignoredNss) {
+                            if (fullName.startsWith(ns + ".")) {
+                                continue loop;
+                            }
+                        }
+                    }
+
                     String workText = AppStrings.translate("work.searching");
                     String decAdd = "";
                     if (!SWF.isCached(pack)) {
diff --git a/src/com/jpexs/decompiler/flash/gui/abc/ClassesListTreeModel.java b/src/com/jpexs/decompiler/flash/gui/abc/ClassesListTreeModel.java
index e0bb8f5cd..02bf1cee8 100644
--- a/src/com/jpexs/decompiler/flash/gui/abc/ClassesListTreeModel.java
+++ b/src/com/jpexs/decompiler/flash/gui/abc/ClassesListTreeModel.java
@@ -74,7 +74,14 @@ public class ClassesListTreeModel extends AS3ClassTreeItem implements TreeModel
     public final void setFilter(String filter) {
         root.clear();
 
+        List<String> ignoredClasses = new ArrayList<>();
+        List<String> ignoredNss = new ArrayList<>();
+        if (Configuration._ignoreAdditionalFlexClasses.get()) {
+            getSwf().getFlexMainClass(ignoredClasses, ignoredNss);
+        }
+
         filter = (filter == null || filter.isEmpty()) ? null : filter.toLowerCase();
+        loop:
         for (ScriptPack item : list) {
             if (filter != null) {
                 if (!item.getClassPath().toString().toLowerCase().contains(filter)) {
@@ -84,6 +91,17 @@ public class ClassesListTreeModel extends AS3ClassTreeItem implements TreeModel
             if (!item.isSimple && Configuration.ignoreCLikePackages.get()) {
                 continue;
             }
+            if (Configuration._ignoreAdditionalFlexClasses.get()) {
+                String fullName = item.getClassPath().packageStr.add(item.getClassPath().className).toRawString();
+                if (ignoredClasses.contains(fullName)) {
+                    continue;
+                }
+                for (String ns : ignoredNss) {
+                    if (fullName.startsWith(ns + ".")) {
+                        continue loop;
+                    }
+                }
+            }
 
             DottedChain packageStr = item.getClassPath().packageStr;
             AS3Package pkg = ensurePackage(packageStr);