diff --git a/chrome/content/zotero/preferences/preferences.js b/chrome/content/zotero/preferences/preferences.js
index ba2aa7f90..9e8f58ba1 100644
--- a/chrome/content/zotero/preferences/preferences.js
+++ b/chrome/content/zotero/preferences/preferences.js
@@ -91,6 +91,11 @@ function onDataDirUpdate(event) {
 	if (event.originalTarget && event.originalTarget.tagName == 'button') {
 		return true;
 	}
+	// Fx3.6
+	else if (event.explicitOriginalTarget && event.explicitOriginalTarget.tagName == 'button') {
+		return true;
+	}
+	
 	// If directory not set or invalid, prompt for location
 	if (!getDataDirPath()) {
 		event.stopPropagation();
@@ -117,8 +122,8 @@ function onDataDirUpdate(event) {
 		Zotero.Prefs.set('useDataDir', useDataDir);
 		var appStartup = Components.classes["@mozilla.org/toolkit/app-startup;1"]
 				.getService(Components.interfaces.nsIAppStartup);
-		appStartup.quit(Components.interfaces.nsIAppStartup.eRestart);
-		appStartup.quit(Components.interfaces.nsIAppStartup.eAttemptQuit);
+		appStartup.quit(Components.interfaces.nsIAppStartup.eAttemptQuit
+			| Components.interfaces.nsIAppStartup.eRestart);
 	}
 	
 	radiogroup.selectedIndex = useDataDir ? 1 : 0;
diff --git a/chrome/content/zotero/xpcom/zotero.js b/chrome/content/zotero/xpcom/zotero.js
index ea9274948..a3fa19258 100644
--- a/chrome/content/zotero/xpcom/zotero.js
+++ b/chrome/content/zotero/xpcom/zotero.js
@@ -622,8 +622,8 @@ var Zotero = new function(){
 		if (index == 0) {
 			var appStartup = Components.classes["@mozilla.org/toolkit/app-startup;1"]
 					.getService(Components.interfaces.nsIAppStartup);
-			appStartup.quit(Components.interfaces.nsIAppStartup.eRestart);
-			appStartup.quit(Components.interfaces.nsIAppStartup.eAttemptQuit);
+			appStartup.quit(Components.interfaces.nsIAppStartup.eAttemptQuit
+				| Components.interfaces.nsIAppStartup.eRestart);
 		}
 		
 		return useProfileDir ? true : file;