diff --git a/static/no_js.css b/static/no_js.css
new file mode 100644
index 0000000..0294a30
--- /dev/null
+++ b/static/no_js.css
@@ -0,0 +1 @@
+.js{display:none}
diff --git a/templates/partials/header.html b/templates/partials/header.html
index 8caef82..81eddcf 100644
--- a/templates/partials/header.html
+++ b/templates/partials/header.html
@@ -110,6 +110,8 @@
     {%- endif -%}">
 
     {%- if config.extra.theme_switcher and config.extra.theme_switcher == true -%}
+        {# If JavaScript is disabled, hide the button. #}
+        <noscript><link rel="stylesheet" href="{{ get_url(path='no_js.css') | safe }}"/></noscript>
         <script type="text/javascript" src="{{ get_url(path='js/initializeTheme.min.js') | safe }}"></script>
         <script defer src="{{ get_url(path='js/themeSwitcher.min.js', trailing_slash=false) | safe }}"/></script>
     {%- endif -%}
diff --git a/templates/partials/nav.html b/templates/partials/nav.html
index 4c98be9..a554d28 100644
--- a/templates/partials/nav.html
+++ b/templates/partials/nav.html
@@ -64,7 +64,7 @@
 
                     {# Theme switcher #}
                     {%- if config.extra.theme_switcher and config.extra.theme_switcher == true -%}
-                        <li class="theme-switcher-wrapper">
+                        <li class="theme-switcher-wrapper js">
                             <div class="theme-switcher"></div>
                         </li>
                     {%- endif -%}