diff --git a/Netdisco/views/inc/js/search.js b/Netdisco/views/inc/js/search.js
index 928f53ca..c87ada15 100644
--- a/Netdisco/views/inc/js/search.js
+++ b/Netdisco/views/inc/js/search.js
@@ -31,7 +31,6 @@
             $(target).html(
               '<div class="span3 alert-message info"><p>No matching records.</p></div>'
             );
-            return;
           }
           // looks good, update the bookmark for this search
           $(mark).attr('href', '/search?' + query);
@@ -58,7 +57,13 @@
       $('#' + from + '_search').toggleClass('active');
       $('#' + to + '_search').toggleClass('active');
 
-      $('#' + to + '_form').trigger("submit");
+      var to_form = '#' + to + '_form';
+      var from_form = '#' + from + '_form';
+      // copy current search string to new form's input box
+      $(to_form).find("input[name=q]").val(
+        $(from_form).find("input[name=q]").val()
+      );
+      $(to_form).trigger("submit");
     });
 
     // fix green background on search checkboxes
diff --git a/Netdisco/views/inc/search/box.tt b/Netdisco/views/inc/search/box.tt
deleted file mode 100644
index 7fb9adc4..00000000
--- a/Netdisco/views/inc/search/box.tt
+++ /dev/null
@@ -1,3 +0,0 @@
-            <div class="clearfix">
-              <input class="span3" name="q" value="[% params.q %]" type="text"/>
-            </div>
diff --git a/Netdisco/views/inc/search/submit.tt b/Netdisco/views/inc/search/submit.tt
deleted file mode 100644
index 25f523d7..00000000
--- a/Netdisco/views/inc/search/submit.tt
+++ /dev/null
@@ -1,4 +0,0 @@
-            <div class="nd_search clearfix">
-              <button id="vlan_submit" type="submit" class="btn info">Search Again</button>
-              <a id="[% tab.id %]_bookmark" href="#"><img class="nd_bookmark" src="/images/glyphicons_072_bookmark.png"></a>
-            </div>