diff --git a/chrome/content/zotero/xpcom/zotero.js b/chrome/content/zotero/xpcom/zotero.js
index 72e74fef61..7ebdf7567f 100644
--- a/chrome/content/zotero/xpcom/zotero.js
+++ b/chrome/content/zotero/xpcom/zotero.js
@@ -391,17 +391,17 @@ Services.scriptloader.loadSubScript("resource://zotero/polyfill.js");
 		
 		if (!Zotero.isConnector) {
 			if (!this.forceDataDir) {
-				yield Zotero.DataDirectory.checkForLostLegacy();
-				if (this.restarting) {
-					return;
-				}
-				
 				yield Zotero.DataDirectory.checkForMigration(
 					dataDir, Zotero.DataDirectory.defaultDir
 				);
 				if (this.skipLoading) {
 					return;
 				}
+				
+				yield Zotero.DataDirectory.checkForLostLegacy();
+				if (this.restarting) {
+					return;
+				}
 			}
 			
 			// Make sure data directory isn't in Dropbox, etc.