diff --git a/app/index.js b/app/index.js
index d47d3c7eabc..2cf0c54a7c7 100644
--- a/app/index.js
+++ b/app/index.js
@@ -394,23 +394,28 @@ app.on('ready', () => {
       app.quit()
     })
 
-    ipcMain.on(messages.PREFS_RESTART, () => {
+    ipcMain.on(messages.PREFS_RESTART, (config, value) => {
       var message = locale.translation('prefsRestart')
 
-      appActions.showMessageBox({
-        buttons: [locale.translation('yes'), locale.translation('no')],
-        options: {
-          persist: false
-        },
-        message
-      })
-      prefsRestartCallbacks[message] = (buttonIndex, persist) => {
-        delete prefsRestartCallbacks[message]
-        if (buttonIndex === 0) {
-          app.relaunch({args: process.argv.slice(1) + ['--relaunch']})
-          app.quit()
-        } else {
-          appActions.hideMessageBox(message)
+      if (prefsRestartCallbacks[config + value]) {
+        delete prefsRestartCallbacks[config + value]
+        appActions.hideMessageBox(message)
+      } else {
+        appActions.showMessageBox({
+          buttons: [locale.translation('yes'), locale.translation('no')],
+          options: {
+            persist: false
+          },
+          message
+        })
+        prefsRestartCallbacks[config + value] = (buttonIndex, persist) => {
+          delete prefsRestartCallbacks[config + value]
+          if (buttonIndex === 0) {
+            app.relaunch({args: process.argv.slice(1) + ['--relaunch']})
+            app.quit()
+          } else {
+            appActions.hideMessageBox(message)
+          }
         }
       }
     })
diff --git a/js/about/preferences.js b/js/about/preferences.js
index 0350d94d3cb..9f44f322d92 100644
--- a/js/about/preferences.js
+++ b/js/about/preferences.js
@@ -423,7 +423,7 @@ class ShieldsTab extends ImmutableComponent {
 class SecurityTab extends ImmutableComponent {
   onToggleFlash (e) {
     aboutActions.setResourceEnabled(flash, e.target.value)
-    ipc.send(messages.PREFS_RESTART)
+    ipc.send(messages.PREFS_RESTART, flash, e.target.value)
   }
   render () {
     return <div>
@@ -661,7 +661,7 @@ class AboutPreferences extends React.Component {
     aboutActions.changeSetting(key, value)
     if (key === settings.DO_NOT_TRACK || key === settings.HARDWARE_ACCELERATION_ENABLED ||
       key === settings.PDFJS_ENABLED || key === settings.SMOOTH_SCROLL_ENABLED) {
-      ipc.send(messages.PREFS_RESTART)
+      ipc.send(messages.PREFS_RESTART, key, value)
     }
   }