diff --git a/chrome/content/zotero/overlay.js b/chrome/content/zotero/overlay.js
index d313d1f95e..ee891ee31d 100644
--- a/chrome/content/zotero/overlay.js
+++ b/chrome/content/zotero/overlay.js
@@ -82,7 +82,7 @@ var ZoteroPane = new function()
 	this.displayErrorMessage = displayErrorMessage;
 	
 	const DEFAULT_ZPANE_HEIGHT = 300;
-	const COLLECTIONS_HEIGHT = 125; // minimum height of the collections pane and toolbar
+	const COLLECTIONS_HEIGHT = 32; // minimum height of the collections pane and toolbar
 	
 	var self = this;
 	var titlebarcolorState, toolbarCollapseState, titleState;
@@ -314,6 +314,11 @@ var ZoteroPane = new function()
 		
 		zoteroSplitter.setAttribute('hidden', !makeVisible);
 		
+		// Make sure tags splitter isn't missing for people upgrading from <2.0b7
+		if (makeVisible) {
+			document.getElementById('zotero-tags-splitter').collapsed = false;
+		}
+		
 		// Restore fullscreen mode if necessary
 		if (makeVisible && isFullScreen()) {
 			this.fullScreen(true);
@@ -842,7 +847,7 @@ var ZoteroPane = new function()
 			}
 			// 121px seems to be enough room for the toolbar and collections
 			// tree at minimum height
-			height = height + 125;
+			height = height + COLLECTIONS_HEIGHT;
 		}
 		
 		//Zotero.debug('Setting Zotero pane minheight to ' + height);
diff --git a/chrome/skin/default/zotero/overlay.css b/chrome/skin/default/zotero/overlay.css
index dce77063f9..881c7fe640 100644
--- a/chrome/skin/default/zotero/overlay.css
+++ b/chrome/skin/default/zotero/overlay.css
@@ -42,7 +42,7 @@ window[active="true"] #zotero-pane[fullscreenmode="true"][platform="mac"]
 }
 
 #zotero-collections-tree {
-	min-height: 80px;
+	min-height: 5.2em;
 }
 
 #zotero-collections-tree treechildren::-moz-tree-image