diff --git a/chrome/content/zotero/overlay.xul b/chrome/content/zotero/overlay.xul
index 6607e243b..6a23079af 100644
--- a/chrome/content/zotero/overlay.xul
+++ b/chrome/content/zotero/overlay.xul
@@ -357,8 +357,7 @@
 			
 			// Used for loading the changelog after upgrades
 			if (Zotero.initialURL) {
-				gBrowser.selectedTab = gBrowser.addTab(Zotero.initialURL);
-				Zotero.initialURL = null;
+				setTimeout("gBrowser.selectedTab = gBrowser.addTab(Zotero.initialURL); Zotero.initialURL = null;", 1);
 			}
 		}
 		else {
diff --git a/chrome/content/zotero/upgrade.xul b/chrome/content/zotero/upgrade.xul
index 183b69e94..bada36336 100644
--- a/chrome/content/zotero/upgrade.xul
+++ b/chrome/content/zotero/upgrade.xul
@@ -33,6 +33,7 @@
 				var wizard = document.getElementById('zotero-schema-upgrade');
 				wizard.getButton('cancel').setAttribute('disabled', true);
 				wizard.canRewind = false;
+				wizard.getButton('finish').focus(); // prevent focusing of changelog link
 			}