diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js
index f2b93c002b2..736acfd4a68 100644
--- a/browser/app/profile/firefox.js
+++ b/browser/app/profile/firefox.js
@@ -641,6 +641,10 @@ pref("plugins.update.notifyUser", false);
 
 pref("plugins.click_to_play", true);
 
+// let all plugins except Flash default to click-to-play
+pref("plugin.default.state", 1);
+pref("plugin.state.flash", 2);
+
 // display door hanger if flash not installed
 pref("plugins.notifyMissingFlash", true);