diff --git a/public/js/live.js b/public/js/live.js
index 8ac6d94..6bd3352 100644
--- a/public/js/live.js
+++ b/public/js/live.js
@@ -605,9 +605,9 @@ $(document).ready(function() {
   setInterval(poll, 30000);
   poll();
 
-  var args = toObject(window.location.search.substr(1).split("&").map(function(arg){ return arg.split("="); }));
-  if (args.q) {
-    $('input[type="search"]').val(args.q);
+  var params = toObject(window.location.search.substr(1).split("&").map(function(arg){ return arg.split("="); }));
+  if (params.q) {
+    $('#submit_section input[type="search"]').val(params.q);
   }
 
   log(`Notification permissions: ${Notification.permission}`);
diff --git a/public/live.html b/public/live.html
index ffcdae1..c74d29c 100644
--- a/public/live.html
+++ b/public/live.html
@@ -31,29 +31,31 @@ <h2 itemprop="description">Add channels to get browser notification when they go
       <label><input type="checkbox" id="mute_notifications"> Mute notifications</label>
     </div>
 
-    <form class="input-group" id="facebook_form">
-      <div class="input-group-addon"><label for="facebook_q">Facebook</label></div>
-      <input class="form-control" type="search" id="facebook_q" placeholder="Enter a Facebook page name or its url." required>
-      <span class="input-group-btn">
-        <button class="btn btn-primary" type="submit">Add</button>
-      </span>
-    </form>
-
-    <form class="input-group" id="youtube_form">
-      <div class="input-group-addon"><label for="youtube_q">YouTube</label></div>
-      <input class="form-control" type="search" name="q" id="youtube_q" placeholder="Enter a YouTube channel name, channel id, or a url to a channel or video." required>
-      <span class="input-group-btn">
-        <button class="btn btn-primary" type="submit">Add</button>
-      </span>
-    </form>
-
-    <form class="input-group" id="twitch_form">
-      <div class="input-group-addon"><label for="twitch_q">Twitch</label></div>
-      <input class="form-control" type="search" name="q" id="twitch_q" placeholder="Enter a Twitch username or a url to a user or video." required>
-      <span class="input-group-btn">
-        <button class="btn btn-primary" type="submit">Add</button>
-      </span>
-    </form>
+    <div id="submit_section">
+      <form class="input-group" id="facebook_form">
+        <div class="input-group-addon"><label for="facebook_q">Facebook</label></div>
+        <input class="form-control" type="search" id="facebook_q" placeholder="Enter a Facebook page name or its url." required>
+        <span class="input-group-btn">
+          <button class="btn btn-primary" type="submit">Add</button>
+        </span>
+      </form>
+
+      <form class="input-group" id="youtube_form">
+        <div class="input-group-addon"><label for="youtube_q">YouTube</label></div>
+        <input class="form-control" type="search" id="youtube_q" placeholder="Enter a YouTube channel name, channel id, or a url to a channel or video." required>
+        <span class="input-group-btn">
+          <button class="btn btn-primary" type="submit">Add</button>
+        </span>
+      </form>
+
+      <form class="input-group" id="twitch_form">
+        <div class="input-group-addon"><label for="twitch_q">Twitch</label></div>
+        <input class="form-control" type="search" id="twitch_q" placeholder="Enter a Twitch username or a url to a user or video." required>
+        <span class="input-group-btn">
+          <button class="btn btn-primary" type="submit">Add</button>
+        </span>
+      </form>
+    </div>
 
     <p>Polled <span id="counter">0</span> times (last updated at <span id="last_updated">N/A</span>).</p>