diff --git a/dev/js/src/init.js b/dev/js/src/init.js
index b5c3baf..ee8f364 100644
--- a/dev/js/src/init.js
+++ b/dev/js/src/init.js
@@ -685,6 +685,7 @@
             const input = form.addE("input");
             input.setAttribute("type","text");
             input.setAttribute("name","state");
+            input.setAttribute("id","state");
 
             const url = new URL(window.location.href);
 
diff --git a/dev/scss/header/header.scss b/dev/scss/header/header.scss
index c3578b6..0d6f899 100644
--- a/dev/scss/header/header.scss
+++ b/dev/scss/header/header.scss
@@ -300,8 +300,12 @@
 
   input {
     @include mixins.input-field;
-    display: none;
+  }
 
+  // Don't show cq input field,
+  // in javascript mode.
+  #cq {
+    display: none;
     .no-js & {
       display: inline-block;
     }
diff --git a/dev/scss/header/state.scss b/dev/scss/header/state.scss
index db1b33e..4c19e07 100644
--- a/dev/scss/header/state.scss
+++ b/dev/scss/header/state.scss
@@ -3,6 +3,6 @@
  */
 
 // Hide state
-input[name=state] {
+#state {
   display: none;
 }