diff --git a/static/styles/subscriptions.css b/static/styles/subscriptions.css
index 397bb5acbe..cda60d1d0c 100644
--- a/static/styles/subscriptions.css
+++ b/static/styles/subscriptions.css
@@ -65,10 +65,6 @@
     font-weight: 300;
 }
 
-#add_new_subscription {
-    text-align: left;
-}
-
 .subscription_header {
     min-height: 47px;
 }
@@ -178,10 +174,6 @@
     border: 1px solid hsl(0, 0%, 68%);
 }
 
-form#add_new_subscription {
-    margin: 0;
-}
-
 .create_stream_button {
     margin: 0 0 0 5px;
 
diff --git a/static/templates/subscription_table_body.hbs b/static/templates/subscription_table_body.hbs
index 4587c500c5..e947aaf622 100644
--- a/static/templates/subscription_table_body.hbs
+++ b/static/templates/subscription_table_body.hbs
@@ -10,17 +10,16 @@
             </div>
             <div class="left">
                 <div class="search-container">
-                    <form id="add_new_subscription" class="form-inline" action="">
+                    <div id="add_new_subscription">
                         {{#if can_create_streams}}
-                        <input type="submit" class="create_stream_button"
-                          value="+" title="{{t 'Create new stream' }} (n)"/>
+                        <button class="create_stream_button" title="{{t 'Create new stream' }} (n)">+</button>
                         {{/if}}
                         <div class="float-clear"></div>
-                    </form>
+                    </div>
                 </div>
                 <div class="input-append stream_name_search_section" id="stream_filter">
                     <input type="text" name="stream_name" id="search_stream_name" autocomplete="off"
-                      placeholder="{{t 'Filter streams' }}" value="" form="add_new_subscription" />
+                      placeholder="{{t 'Filter streams' }}" value=""/>
                     <button type="button" class="btn clear_search_button" id="clear_search_stream_name">
                         <i class="fa fa-remove" aria-hidden="true"></i>
                     </button>