diff --git a/chrome/content/zotero/overlay.js b/chrome/content/zotero/overlay.js
index 0bf826674..10024536b 100644
--- a/chrome/content/zotero/overlay.js
+++ b/chrome/content/zotero/overlay.js
@@ -63,7 +63,7 @@ var ZoteroOverlay = new function()
 						// load Zotero as a tab, if it isn't loading by default
 						ZoteroOverlay.loadZoteroTab(true);
 					}
-				} else {
+				} else if(showInPref === 1) {
 					// close Zotero as a tab, in case it was pinned
 					var zoteroTab = ZoteroOverlay.findZoteroTab();
 					if(zoteroTab) gBrowser.removeTab(zoteroTab);
diff --git a/chrome/content/zotero/tab.js b/chrome/content/zotero/tab.js
index a1c10df4b..79a2be887 100644
--- a/chrome/content/zotero/tab.js
+++ b/chrome/content/zotero/tab.js
@@ -83,7 +83,7 @@ var ZoteroTab = new function()
 			this.containerWindow.gBrowser.tabContainer.addEventListener("TabSelect", listener, false);
 		}
 		
-		if(Zotero && Zotero.isFx4) {
+		if(Zotero && Zotero.isFx4 && Zotero.Prefs.get("showIn") == 3) {
 			// on Fx 4, add an event listener so the pinned tab isn't restored on close
 			var pinnedTabCloser = function() {
 				try {