diff --git a/chrome/content/zotero/standalone/hiddenWindow.xul b/chrome/content/zotero/standalone/hiddenWindow.xul
index b34f6a173..ddf43400f 100644
--- a/chrome/content/zotero/standalone/hiddenWindow.xul
+++ b/chrome/content/zotero/standalone/hiddenWindow.xul
@@ -37,24 +37,67 @@
 ]>
 
 <window id="main-window" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-    <script type="application/javascript" src="chrome://global/content/globalOverlay.js"/>
+	<script type="application/javascript" src="chrome://global/content/globalOverlay.js"/>
+	<script>
+		function openMainWindow() {
+			var prefService = Components.classes["@mozilla.org/preferences-service;1"]
+				.getService(Components.interfaces.nsIPrefBranch);
+			var chromeURI = prefService.getCharPref('toolkit.defaultChromeURI');
+			var flags = prefService.getCharPref("toolkit.defaultChromeFeatures", "chrome,dialog=no,all");
+			
+			var ww = Components.classes['@mozilla.org/embedcomp/window-watcher;1']
+				.getService(Components.interfaces.nsIWindowWatcher);
+			ww.openWindow(null, chromeURI, '_blank', flags, null);
+		}
+		
+		function openAbout() {
+			var ww = Components.classes['@mozilla.org/embedcomp/window-watcher;1']
+				.getService(Components.interfaces.nsIWindowWatcher);
+			ww.openWindow(null, 'chrome://zotero/content/about.xul', 'about', 'chrome,dialog=yes', null);
+		}
+	</script>
 	<commandset id="mainCommandSet">
-		<!--FILE-->
 		<command id="cmd_quitApplication" oncommand="goQuitApplication();"/>
+		<command id="cmd_close" disabled="true"/>
+		<command id="minimizeWindow" disabled="true"/>
+		<command id="zoomWindow" disabled="true"/>
+		<command id="cmd_mainWindow" oncommand="openMainWindow();"/>
 	</commandset>
 	
 	<keyset id="mainKeyset">
 		<key id="key_close" key="&closeCmd.key;" command="cmd_close" modifiers="accel"/>
+		<key id="key_mainWindow" key="0" command="cmd_mainWindow" modifiers="accel"/>
 	</keyset>
 
 	<menubar id="main-menubar">
 		<menu id="fileMenu" label="&fileMenu.label;" accesskey="&fileMenu.accesskey;">
 			<menupopup id="menu_FilePopup">
-                <menuitem id="aboutName"
-                          accesskey="&aboutProduct.accesskey;"
-                          label="&aboutProduct.label;"
-                          oncommand="Components.classes['@mozilla.org/appshell/window-mediator;1'].getService(Components.interfaces.nsIWindowMediator).getMostRecentWindow('navigator:browser').ZoteroPane.openAboutDialog();"/>
-            </menupopup>
+				<!-- This gets moved to the Application menu automatically -->
+				<menuitem id="aboutName"
+					accesskey="&aboutProduct.accesskey;"
+					label="&aboutProduct.label;"
+					oncommand="openAbout()"/>
+
+				<!-- Disabled Close line in File menu, just to show something -->
+                <menuitem id="menu_close"
+					label="&closeCmd.label;"
+					key="key_close"
+					command="cmd_close"/>
+			</menupopup>
+		</menu>
+	
+		<menu id="windowMenu" onpopupshowing="">
+			<menupopup>
+				<menuitem command="minimizeWindow" key="key_minimizeWindow"/>
+				<menuitem command="zoomWindow"/>
+				<menuseparator/>
+				<menuitem command="cmd_mainWindow" label="Zotero" key="key_mainWindow"/>
+				<!--
+					Prevent error from macWindowMenuDidShow(), which is called from a built-in
+					nWindowMenuShowing(), when opening menu
+				-->
+				<menuseparator id="sep-window-list" hidden="true"/>
+			</menupopup>
 		</menu>
 	</menubar>
 </window>
diff --git a/chrome/content/zotero/standalone/standalone.js b/chrome/content/zotero/standalone/standalone.js
index 4a2ebc253..e9f08b428 100644
--- a/chrome/content/zotero/standalone/standalone.js
+++ b/chrome/content/zotero/standalone/standalone.js
@@ -225,7 +225,6 @@ const ZoteroStandalone = new function() {
 	 */
 	this.onUnload = function() {
 		ZoteroPane.destroy();
-		goQuitApplication();
 	}
 }