diff --git a/chrome/content/zotero/xpcom/zotero.js b/chrome/content/zotero/xpcom/zotero.js
index 438a857e5..b1970031d 100644
--- a/chrome/content/zotero/xpcom/zotero.js
+++ b/chrome/content/zotero/xpcom/zotero.js
@@ -476,7 +476,7 @@ var Zotero = new function(){
 		// Initialize various services
 		Zotero.Integration.init();
 		
-		if(Zotero.isStandalone) {
+		if(Zotero.Prefs.get("connector.enabled")) {
 			Zotero.Connector.init();
 		}
 		
@@ -796,6 +796,9 @@ var Zotero = new function(){
 					Zotero.Prefs.set('dataDir', file.persistentDescriptor);
 					Zotero.Prefs.set('lastDataDir', file.path);
 					Zotero.Prefs.set('useDataDir', true);
+					
+					// Enable connector by default, even if it was disabled
+					Zotero.Prefs.set('connector.enabled', true);
 					break;
 				}
 				else {
diff --git a/defaults/preferences/zotero.js b/defaults/preferences/zotero.js
index eca7b246f..ee403f9ba 100644
--- a/defaults/preferences/zotero.js
+++ b/defaults/preferences/zotero.js
@@ -111,6 +111,9 @@ pref("extensions.zotero.connector.port", 23119);	// ascii "ZO"
 // Zeroconf
 pref("extensions.zotero.zeroconf.server.enabled", false);
 
+// Connector
+pref("extensions.zotero.connector.enabled", false);
+
 // Zotero Commons
 pref("extensions.zotero.commons.enabled", false);
 pref("extensions.zotero.commons.accessKey", '');