diff --git a/chrome/content/zotero/overlay.js b/chrome/content/zotero/overlay.js
index ba0019388f..2273ea5a67 100644
--- a/chrome/content/zotero/overlay.js
+++ b/chrome/content/zotero/overlay.js
@@ -216,6 +216,16 @@ var ZoteroPane = new function()
 			}, 400);
 			Zotero.Prefs.set('firstRun', false);
 		}
+		
+		// Hide sync debugging menu by default
+		if (Zotero.Prefs.get('sync.debugMenu')) {
+			var sep = document.getElementById('zotero-tb-actions-sync-separator');
+			var menuitems = [];
+			sep.nextSibling.hidden = false;
+			sep.nextSibling.nextSibling.hidden = false;
+			sep.nextSibling.nextSibling.nextSibling.hidden = false;
+			sep.nextSibling.nextSibling.nextSibling.nextSibling.hidden = false;
+		}
 	}
 	
 	
diff --git a/chrome/content/zotero/overlay.xul b/chrome/content/zotero/overlay.xul
index f69bb0105c..0217df2d50 100644
--- a/chrome/content/zotero/overlay.xul
+++ b/chrome/content/zotero/overlay.xul
@@ -128,10 +128,10 @@
 								<menuseparator id="zotero-tb-actions-plugins-separator"/>
 								<menuitem id="zotero-tb-actions-timeline" label="&zotero.toolbar.timeline.label;" oncommand="Zotero_Timeline_Interface.loadTimeline()"/>
 								<menuseparator id="zotero-tb-actions-sync-separator"/>
-								<menuitem label="Sync Debugging" disabled="true"/>
-								<menuitem label="  Clear Server Data" oncommand="Zotero.Sync.Server.clear()"/>
-								<menuitem label="  Reset Server Lock" oncommand="Zotero.Sync.Server.resetServer()"/>
-								<menuitem label="  Reset Client" oncommand="Zotero.Sync.Server.resetClient()"/>
+								<menuitem hidden="true" label="Sync Debugging" disabled="true"/>
+								<menuitem hidden="true" label="  Clear Server Data" oncommand="Zotero.Sync.Server.clear()"/>
+								<menuitem hidden="true" label="  Reset Server Lock" oncommand="Zotero.Sync.Server.resetServer()"/>
+								<menuitem hidden="true" label="  Reset Client" oncommand="Zotero.Sync.Server.resetClient()"/>
 								<menuitem label="Storage Debugging" disabled="true"/>
 								<menuitem label="  Reset Storage History" oncommand="Zotero.Sync.Storage.resetAllSyncStates()"/>
 								<menuitem label="  Purge Deleted Storage Files" oncommand="Zotero.Sync.Storage.purgeDeletedStorageFiles(function(results) { Zotero.debug(results); })"/>