diff --git a/AppKit/Cib/CPCib.j b/AppKit/Cib/CPCib.j
index fd36feac9..b5f4e4ffb 100644
--- a/AppKit/Cib/CPCib.j
+++ b/AppKit/Cib/CPCib.j
@@ -71,6 +71,9 @@ var CPCibObjectDataKey  = @"CPCibObjectDataKey";
          [CPMenu setMenuBarVisible:YES];
     }
     
+    if (topLevelObjects)
+        [topLevelObjects addObjectsFromArray:[objectData topLevelObjects]];
+    
     /*
 //    [objectData establishConnectionsWithOwner:owner topLevelObjects:topLevelObjects];
 //    [objectData cibInstantiateWithOwner:owner topLevelObjects:topLevelObjects];
diff --git a/AppKit/Cib/_CPCibCustomObject.j b/AppKit/Cib/_CPCibCustomObject.j
index 61a8374b1..37f627b10 100644
--- a/AppKit/Cib/_CPCibCustomObject.j
+++ b/AppKit/Cib/_CPCibCustomObject.j
@@ -34,6 +34,9 @@ var _CPCibCustomObjectClassName = @"_CPCibCustomObjectClassName";
     
     if (!theClass)
         CPLog("Unknown class \"" + _className + "\" in cib file");
+        
+    if (theClass === [CPApplication class])
+        return [CPApplication sharedApplication];
     
     return [[theClass alloc] init];
 }