diff --git a/direct/src/leveleditor/FileMgr.py b/direct/src/leveleditor/FileMgr.py
index 2c118064f4..43682b6c27 100755
--- a/direct/src/leveleditor/FileMgr.py
+++ b/direct/src/leveleditor/FileMgr.py
@@ -1,9 +1,10 @@
 import os
 import imp
 
-import ObjectMgr
-import ObjectHandler
-import ObjectPalette
+from ObjectMgr import ObjectMgr
+from ObjectHandler import ObjectHandler
+from ObjectPalette import ObjectPalette
+from ProtoPalette import ProtoPalette
 import ObjectGlobals as OG
 
 class FileMgr:
@@ -45,9 +46,10 @@ class FileMgr:
         file, pathname, description = imp.find_module(moduleName, [dirname])
         try:
             if self.editor is None: # when loaded outside of LE
-                base.objectPalette = ObjectPalette.ObjectPalette()
-                base.objectHandler = ObjectHandler.ObjectHandler(None)
-                base.objectMgr = ObjectMgr.ObjectMgr(None)
+                base.objectPalette = ObjectPalette()
+                base.protoPalette = ProtoPalette()
+                base.objectHandler = ObjectHandler(None)
+                base.objectMgr = ObjectMgr(None)
 
             module = imp.load_module(moduleName, file, pathname, description)
         except:
diff --git a/direct/src/leveleditor/ObjectMgr.py b/direct/src/leveleditor/ObjectMgr.py
index ee5f453d69..e8967b1872 100755
--- a/direct/src/leveleditor/ObjectMgr.py
+++ b/direct/src/leveleditor/ObjectMgr.py
@@ -67,8 +67,10 @@ class ObjectMgr:
             objDef = self.editor.objectPalette.findItem(typeName)
             if objDef is None:
                 objDef = self.editor.protoPalette.findItem(typeName)
-        else:
+        else: # when loaded outside of LE
             objDef = base.objectPalette.findItem(typeName)
+            if objDef is None:
+                objDef = base.protoPalette.findItem(typeName)
         newobj = None
         if objDef and type(objDef) != dict:
             if objDef.createFunction:
@@ -78,7 +80,7 @@ class ObjectMgr:
                     # when it's using default objectHandler
                     if self.editor:
                         func = Functor(eval("base.le.objectHandler%s"%funcName))
-                    else:
+                    else: # when loaded outside of LE
                         func = Functor(eval("base.objectHandler%s"%funcName))                        
                 else:
                     # when it's not using default objectHandler, whole name of the handling obj
@@ -405,7 +407,7 @@ class ObjectMgr:
         if funcName.startswith('.'):
             if self.editor:
                 func = Functor(eval("base.le.objectHandler%s"%funcName))
-            else:
+            else: # when loaded outside of LE
                 func = Functor(eval("base.objectHandler%s"%funcName))                
         else:
             func = Functor(eval(funcName))