diff --git a/tildes/tildes/templates/topic.jinja2 b/tildes/tildes/templates/topic.jinja2
index 78e60a8..a3512cb 100644
--- a/tildes/tildes/templates/topic.jinja2
+++ b/tildes/tildes/templates/topic.jinja2
@@ -166,12 +166,11 @@
               >{{ option.description }}</option>
             {% endfor %}
           </select>
+          {# add a submit button for people with js disabled so this is still usable #}
+          <noscript>
+            <button type="submit" class="btn btn-primary btn-sm">OK</button>
+          </noscript>
         </div>
-
-        {# add a submit button for people with js disabled so this is still usable #}
-        <noscript>
-          <button type="submit" class="btn btn-primary btn-sm">OK</button>
-        </noscript>
       </form>
     </header>
 
diff --git a/tildes/tildes/templates/topic_listing.jinja2 b/tildes/tildes/templates/topic_listing.jinja2
index ab4bf51..d8f9f56 100644
--- a/tildes/tildes/templates/topic_listing.jinja2
+++ b/tildes/tildes/templates/topic_listing.jinja2
@@ -64,12 +64,11 @@
         <option value="all"{{ ' selected' if not period else '' }}>all time</option>
         <option value="other">other period</option>
       </select>
+      {# add a submit button for people with js disabled so this is still usable #}
+      <noscript>
+        <button type="submit" class="btn btn-primary btn-sm">OK</button>
+      </noscript>
     </div>
-
-    {# add a submit button for people with js disabled so this is still usable #}
-    <noscript>
-      <button type="submit" class="btn btn-primary btn-sm">OK</button>
-    </noscript>
   </form>
 
   {% if not is_default_view %}