diff --git a/src/librustdoc/html/render/context.rs b/src/librustdoc/html/render/context.rs
index c5dbf8aa754..68e2f0cf9c0 100644
--- a/src/librustdoc/html/render/context.rs
+++ b/src/librustdoc/html/render/context.rs
@@ -609,6 +609,11 @@ impl<'tcx> FormatRenderer<'tcx> for Context<'tcx> {
                         </a>\
                      </span>\
                      </div>\
+                     <noscript>\
+                        <section>\
+                            You need to enable Javascript be able to update your settings.\
+                        </section>\
+                     </noscript>\
                      <link rel=\"stylesheet\" type=\"text/css\" \
                          href=\"{root_path}settings{suffix}.css\">\
                      <script defer src=\"{root_path}settings{suffix}.js\"></script>",
diff --git a/src/test/rustdoc-gui/settings.goml b/src/test/rustdoc-gui/settings.goml
index 1b2d1e31f52..cbfc67e7906 100644
--- a/src/test/rustdoc-gui/settings.goml
+++ b/src/test/rustdoc-gui/settings.goml
@@ -65,3 +65,9 @@ assert-local-storage: {"rustdoc-disable-shortcuts": "true"}
 goto: file://|DOC_PATH|/settings.html
 wait-for: "#settings"
 assert-css: (".setting-line .toggle .slider", {"width": "45px", "margin-right": "20px"})
+
+// We now check the display with JS disabled.
+assert-false: "noscript section"
+javascript: false
+reload:
+assert-css: ("noscript section", {"display": "block"})