diff --git a/src/main/java/noppes/npcs/client/gui/util/script/ClassPathFinder.java b/src/main/java/noppes/npcs/client/gui/util/script/ClassPathFinder.java
index 958b2c542..e54f5d878 100644
--- a/src/main/java/noppes/npcs/client/gui/util/script/ClassPathFinder.java
+++ b/src/main/java/noppes/npcs/client/gui/util/script/ClassPathFinder.java
@@ -306,9 +306,14 @@ public class ClassPathFinder {
         if (validPackages.contains(packagePath)) {
             return true;
         }
+
+        // Try to consult the global PackageFinder index if initialized (fast O(1) lookup)
+        if (PackageFinder.find(packagePath)) {
+            registerValidPackage(packagePath);
+            return true;
+        }
         
-        // Try to find any class under this package to validate it
-        // Common test classes for well-known packages
+        // Fallback: try to find any class under this package to validate it
         String[] testClasses = getTestClassesForPackage(packagePath);
         for (String testClass : testClasses) {
             try {