diff --git a/Applications/TextMate/src/AppController.mm b/Applications/TextMate/src/AppController.mm
index a674db39..5e9b28ec 100644
--- a/Applications/TextMate/src/AppController.mm
+++ b/Applications/TextMate/src/AppController.mm
@@ -190,8 +190,7 @@ BOOL HasDocumentWindow (NSArray* windows)
 			}
 		}
 	}
-
-	bundles::build_index(path::join(path::home(), "Library/Application Support/TextMate/Cache"));
+	[BundlesManager sharedInstance];
 
 	[[TMPlugInController sharedInstance] loadAllPlugIns:nil];
 
@@ -215,8 +214,6 @@ BOOL HasDocumentWindow (NSArray* windows)
 	if(!disableUntitledAtStartupPrefs && !HasDocumentWindow([NSApp orderedWindows]))
 		[self newDocument:self];
 
-	[BundlesManager sharedInstance]; // trigger periodic polling of remote bundle index
-
 	SoftwareUpdate* swUpdate = [SoftwareUpdate sharedInstance];
 	[swUpdate setSignee:key_chain_t::key_t("org.textmate.duff", "Allan Odgaard", "-----BEGIN PUBLIC KEY-----\nMIIBtjCCASsGByqGSM44BAEwggEeAoGBAPIE9PpXPK3y2eBDJ0dnR/D8xR1TiT9m\n8DnPXYqkxwlqmjSShmJEmxYycnbliv2JpojYF4ikBUPJPuerlZfOvUBC99ERAgz7\nN1HYHfzFIxVo1oTKWurFJ1OOOsfg8AQDBDHnKpS1VnwVoDuvO05gK8jjQs9E5LcH\ne/opThzSrI7/AhUAy02E9H7EOwRyRNLofdtPxpa10o0CgYBKDfcBscidAoH4pkHR\nIOEGTCYl3G2Pd1yrblCp0nCCUEBCnvmrWVSXUTVa2/AyOZUTN9uZSC/Kq9XYgqwj\nhgzqa8h/a8yD+ao4q8WovwGeb6Iso3WlPl8waz6EAPR/nlUTnJ4jzr9t6iSH9owS\nvAmWrgeboia0CI2AH++liCDvigOBhAACgYAFWO66xFvmF2tVIB+4E7CwhrSi2uIk\ndeBrpmNcZZ+AVFy1RXJelNe/cZ1aXBYskn/57xigklpkfHR6DGqpEbm6KC/47Jfy\ny5GEx+F/eBWEePi90XnLinytjmXRmS2FNqX6D15XNG1xJfjociA8bzC7s4gfeTUd\nlpQkBq2z71yitA==\n-----END PUBLIC KEY-----\n")];
 	[swUpdate setChannels:[NSDictionary dictionaryWithObjectsAndKeys:
diff --git a/Frameworks/BundlesManager/src/BundlesManager.mm b/Frameworks/BundlesManager/src/BundlesManager.mm
index ed444b05..e608f0ce 100644
--- a/Frameworks/BundlesManager/src/BundlesManager.mm
+++ b/Frameworks/BundlesManager/src/BundlesManager.mm
@@ -1,4 +1,5 @@
 #import "BundlesManager.h"
+#import "load_bundles.h"
 #import <OakFoundation/NSDate Additions.h>
 #import <network/network.h>
 #import <oak/server.h>
@@ -138,6 +139,8 @@ static BundlesManager* SharedInstance;
 		sourceList   = bundles_db::sources();
 		bundlesIndex = bundles_db::index(kInstallDirectory);
 
+		load_bundles(path::join(path::home(), "Library/Application Support/TextMate/Cache"));
+
 		[self updateSources:nil];
 		[NSTimer scheduledTimerWithTimeInterval:4*60*60 target:self selector:@selector(updateSources:) userInfo:nil repeats:YES];
 	}