diff --git a/chrome/content/zotero/overlay.js b/chrome/content/zotero/overlay.js
index 15548dc6d..9afe16d01 100644
--- a/chrome/content/zotero/overlay.js
+++ b/chrome/content/zotero/overlay.js
@@ -156,10 +156,12 @@ var ZoteroPane = new function()
 	
 	function fullScreen()
 	{
-		var visible = document.getElementById('content').getAttribute('collapsed') == 'true';
-		document.getElementById('content').setAttribute('collapsed', !visible);
-		document.getElementById('zotero-splitter').setAttribute('collapsed', !visible);
-		document.getElementById('tb-fullscreen').setAttribute('fullscreenmode', !visible);
+		var collapsed = document.getElementById('content').getAttribute('collapsed') == 'true';
+		// Turn Z-pane flex on to stretch to window in full-screen, but off otherwise so persist works
+		document.getElementById('zotero-pane').setAttribute('flex', collapsed ? "0" : "1");
+		document.getElementById('content').setAttribute('collapsed', !collapsed);
+		document.getElementById('zotero-splitter').setAttribute('collapsed', !collapsed);
+		document.getElementById('tb-fullscreen').setAttribute('fullscreenmode', !collapsed);
 	}
 		
 	/*
diff --git a/chrome/content/zotero/overlay.xul b/chrome/content/zotero/overlay.xul
index 9192f8b55..f4b661de1 100644
--- a/chrome/content/zotero/overlay.xul
+++ b/chrome/content/zotero/overlay.xul
@@ -47,7 +47,7 @@
 	<vbox id="appcontent">
 		<!-- Changes to attributes of zotero-splitter and zotero-pane must be mirrored on overlay.js's onLoad() function -->
 		<splitter id="zotero-splitter" resizebefore="closest" resizeafter="closest" collapsed="true"/>
-		<hbox id="zotero-pane" flex="1" persist="height" collapsed="true">
+		<hbox id="zotero-pane" persist="height" collapsed="true">
 			<popupset>
 				<popup id="zotero-collectionmenu" onpopupshowing="ZoteroPane.buildCollectionContextMenu();">
 					<menuitem label="&zotero.toolbar.newCollection.label;" command="cmd_zotero_newCollection"/>