diff --git a/chrome/content/zotero/overlay.xul b/chrome/content/zotero/overlay.xul
index 4ff5999dc8..d96237debe 100644
--- a/chrome/content/zotero/overlay.xul
+++ b/chrome/content/zotero/overlay.xul
@@ -50,6 +50,8 @@
 						oncommand="ZoteroOverlay.toggleDisplay();"/>
 	</toolbarpalette>
 	
+	<toolbar id="zotero-toolbar" nowindowdrag="true"/>
+	
 	<vbox id="appcontent">
 		<!-- onmouseup shouldn't be necessary but seems to help prevent tag selector from sometimes going off the screen -->
 		<splitter id="zotero-splitter" resizebefore="closest" resizeafter="closest" hidden="true"
diff --git a/chrome/content/zotero/zoteroPane.xul b/chrome/content/zotero/zoteroPane.xul
index 22ee1396eb..a6e41773ef 100644
--- a/chrome/content/zotero/zoteroPane.xul
+++ b/chrome/content/zotero/zoteroPane.xul
@@ -97,7 +97,7 @@
 			onkeyup="ZoteroPane_Local.handleKeyUp(event, this.id)"
 			chromedir="&locale.dir;">
 			
-			<hbox id="zotero-toolbar" class="toolbar">
+			<toolbar id="zotero-toolbar" class="toolbar">
 				<hbox id="zotero-collections-toolbar">
 					<toolbarbutton id="zotero-tb-collection-add" class="zotero-tb-button" tooltiptext="&zotero.toolbar.newCollection.label;" command="cmd_zotero_newCollection"/>
 					<toolbarbutton id="zotero-tb-group-add" class="zotero-tb-button" tooltiptext="&zotero.toolbar.newGroup;" oncommand="ZoteroPane_Local.newGroup()"/>
@@ -232,7 +232,7 @@
 					<toolbarbutton id="zotero-tb-fullscreen" tooltiptext="&zotero.toolbar.tab.tooltip;" oncommand="ZoteroPane_Local.toggleTab();" class="zotero-tb-button"/>
 					<toolbarbutton id="zotero-close-button" class="tabs-closebutton" oncommand="ZoteroOverlay.toggleDisplay()"/>
 				</hbox>
-			</hbox>
+			</toolbar>
 			
 			<popupset>
 				<menupopup id="zotero-collectionmenu" onpopupshowing="ZoteroPane_Local.buildCollectionContextMenu();">