diff --git a/chrome/content/zotero/bindings/guidancepanel.xml b/chrome/content/zotero/bindings/guidancepanel.xml
index 59a8f8f770..5f9999e50d 100644
--- a/chrome/content/zotero/bindings/guidancepanel.xml
+++ b/chrome/content/zotero/bindings/guidancepanel.xml
@@ -74,6 +74,14 @@
 					} else {
 						f();
 					}
+
+					if(this.hasAttribute("noautohide")) {
+						var listener = function() {
+							panel.hidePopup();
+							panel.removeEventListener("click", listener, false);
+						}
+						panel.addEventListener("click", listener, false);
+					}
 				]]>
 				</body>
 			</method>
@@ -87,7 +95,7 @@
 		</implementation>
 		
 		<content>
-			<xul:panel orient="horizontal" style="max-width: 400px" type="arrow" align="top">
+			<xul:panel orient="horizontal" style="max-width: 400px" type="arrow" align="top" xbl:inherits="noautohide">
 				<xul:image src="chrome://zotero/skin/zotero-new-z-48px.png" style="margin-right: 10px; width: 48px; height: 48px;"/>
 				<xul:description flex="1"></xul:description>
 			</xul:panel>
diff --git a/chrome/content/zotero/overlay.xul b/chrome/content/zotero/overlay.xul
index 0bfe94cc07..78c2ebcdc3 100644
--- a/chrome/content/zotero/overlay.xul
+++ b/chrome/content/zotero/overlay.xul
@@ -52,7 +52,7 @@
 	<toolbar id="zotero-toolbar" nowindowdrag="true"/>
 	
 	<vbox id="appcontent">
-		<zoteroguidancepanel id="zotero-toolbar-button-guidance" about="toolbarButton" for="zotero-toolbar-button" position="bottomcenter topleft" delay="1000" foregroundonly="true"/>
+		<zoteroguidancepanel id="zotero-toolbar-button-guidance" about="toolbarButton" for="zotero-toolbar-button" position="bottomcenter topleft" delay="1000" foregroundonly="true" noautohide="true"/>
 		<!-- 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"
 			onmouseup="ZoteroPane.updateTagSelectorSize()"/>