diff --git a/src/view/ThemeSettings.js b/src/view/ThemeSettings.js
index <HASH>..<HASH> 100644
--- a/src/view/ThemeSettings.js
+++ b/src/view/ThemeSettings.js
@@ -121,6 +121,10 @@ define(function (require, exports, module) {
                     prefs.set(setting, newSettings[setting]);
                 });
             }
+            else if (id === "cancel") {
+                // Make sure we revert any changes to theme selection
+                prefs.set("themes", currentSettings.themes);
+            }
         });
     }
Revert theme settings when canceling out of the settings dialog