diff --git a/app/src/processing/app/Base.java b/app/src/processing/app/Base.java
index 49797b192..abd650d57 100644
--- a/app/src/processing/app/Base.java
+++ b/app/src/processing/app/Base.java
@@ -510,6 +510,11 @@ public class Base {
   List<ToolContribution> contribTools;
 
 
+  public List<ToolContribution> getCoreTools() {
+    return coreTools;
+  }
+
+
   public List<ToolContribution> getToolContribs() {
     return contribTools;
   }
diff --git a/java/src/processing/mode/java/JavaEditor.java b/java/src/processing/mode/java/JavaEditor.java
index 2a4242d4a..33efb289c 100644
--- a/java/src/processing/mode/java/JavaEditor.java
+++ b/java/src/processing/mode/java/JavaEditor.java
@@ -376,10 +376,10 @@ public class JavaEditor extends Editor {
         boolean isCoreToolMenuItemAdded = false;
         boolean isContribToolMenuItemAdded = false;
 
-        List<ToolContribution> contribTools = getToolContribs();
+        List<ToolContribution> contribTools = base.getToolContribs();
         // Adding this in in case a reference folder is added for MovieMaker, or in case
         // other core tools are introduced later
-        isCoreToolMenuItemAdded = addToolReferencesToSubMenu(getCoreTools(), toolRefSubmenu);
+        isCoreToolMenuItemAdded = addToolReferencesToSubMenu(base.getCoreTools(), toolRefSubmenu);
 
         if (isCoreToolMenuItemAdded && !contribTools.isEmpty())
           toolRefSubmenu.addSeparator();
@@ -398,7 +398,7 @@ public class JavaEditor extends Editor {
         else if (!isContribToolMenuItemAdded && !contribTools.isEmpty()) {
           // re-populate the menu to get rid of terminal separator
           toolRefSubmenu.removeAll();
-          addToolReferencesToSubMenu(getCoreTools(), toolRefSubmenu);
+          addToolReferencesToSubMenu(base.getCoreTools(), toolRefSubmenu);
         }
       }