diff --git a/src/librustdoc/html/render.rs b/src/librustdoc/html/render.rs
index ea97cea9428..211c4157da8 100644
--- a/src/librustdoc/html/render.rs
+++ b/src/librustdoc/html/render.rs
@@ -914,7 +914,7 @@ themePicker.onblur = handleThemeButtonsBlur;
     var but = document.createElement('button');
     but.innerHTML = item;
     but.onclick = function(el) {{
-        switchTheme(currentTheme, mainTheme, item);
+        switchTheme(currentTheme, mainTheme, item, true);
     }};
     but.onblur = handleThemeButtonsBlur;
     themes.appendChild(but);
diff --git a/src/librustdoc/html/static/storage.js b/src/librustdoc/html/static/storage.js
index 86efc781560..c55b1e41443 100644
--- a/src/librustdoc/html/static/storage.js
+++ b/src/librustdoc/html/static/storage.js
@@ -86,7 +86,7 @@ function getCurrentValue(name) {
     return null;
 }
 
-function switchTheme(styleElem, mainStyleElem, newTheme, skipStorage) {
+function switchTheme(styleElem, mainStyleElem, newTheme, saveTheme) {
     var fullBasicCss = "rustdoc" + resourcesSuffix + ".css";
     var fullNewTheme = newTheme + resourcesSuffix + ".css";
     var newHref = mainStyleElem.href.replace(fullBasicCss, fullNewTheme);
@@ -111,7 +111,7 @@ function switchTheme(styleElem, mainStyleElem, newTheme, skipStorage) {
         styleElem.href = newHref;
         // If this new value comes from a system setting or from the previously saved theme, no
         // need to save it.
-        if (skipStorage !== true) {
+        if (saveTheme === true) {
             updateLocalStorage("rustdoc-theme", newTheme);
         }
     }
@@ -123,4 +123,4 @@ function getSystemValue() {
 
 switchTheme(currentTheme, mainTheme,
             getCurrentValue("rustdoc-theme") || getSystemValue() || "light",
-            true);
+            false);