diff --git a/chrome/content/zotero/xpcom/zotero.js b/chrome/content/zotero/xpcom/zotero.js
index 49975001c1..5df1d849c6 100644
--- a/chrome/content/zotero/xpcom/zotero.js
+++ b/chrome/content/zotero/xpcom/zotero.js
@@ -1507,8 +1507,15 @@ Components.utils.import("resource://gre/modules/osfile.jsm");
 		
 		let errors;
 		let mode = automatic ? 'automatic' : 'manual';
+		// This can seemingly fail due to a race condition building the Standalone window,
+		// so just ignore it if it does
 		try {
 			this.showZoteroPaneProgressMeter(Zotero.getString("dataDir.migration.inProgress"));
+		}
+		catch (e) {
+			Zotero.logError(e);
+		}
+		try {
 			errors = yield Zotero.migrateDataDirectory(oldDir, newDir, partial, progressHandler);
 		}
 		catch (e) {