diff --git a/chrome/content/zotero/standalone/standalone.js b/chrome/content/zotero/standalone/standalone.js
index f98c73232..50cd8924f 100644
--- a/chrome/content/zotero/standalone/standalone.js
+++ b/chrome/content/zotero/standalone/standalone.js
@@ -33,6 +33,11 @@ const ZoteroStandalone = new function() {
 	 * Run when standalone window first opens
 	 */
 	this.onLoad = function() {
+		// Fix window without menubar/titlebar when Zotero is closed in full-screen mode in OS X 10.11+
+		if (Zotero.isMac && window.document.documentElement.getAttribute('sizemode') == 'fullscreen') {
+			window.document.documentElement.setAttribute('sizemode', 'normal');
+		}
+		
 		Zotero.Promise.try(function () {
 			if(!Zotero) {
 				throw true;
diff --git a/chrome/content/zotero/zoteroPane.js b/chrome/content/zotero/zoteroPane.js
index d1c0dc84f..e67c58bb3 100644
--- a/chrome/content/zotero/zoteroPane.js
+++ b/chrome/content/zotero/zoteroPane.js
@@ -73,13 +73,6 @@ var ZoteroPane = new function()
 	this.init = function () {
 		Zotero.debug("Initializing Zotero pane");
 		
-		// Fix window without menubar/titlebar when Standalone is closed in full-screen mode
-		// in OS X 10.11
-		if (Zotero.isMac && Zotero.isStandalone
-				&& window.document.documentElement.getAttribute('sizemode') == 'fullscreen') {
-			window.document.documentElement.setAttribute('sizemode', 'normal');
-		}
-		
 		// For now, keep actions menu in the DOM and show it in Firefox for development
 		if (!Zotero.isStandalone) {
 			document.getElementById('zotero-tb-actions-menu-separator').hidden = false;