diff --git a/Netdisco/lib/Netdisco.pm b/Netdisco/lib/Netdisco.pm
index df775a0b..a45a9c35 100644
--- a/Netdisco/lib/Netdisco.pm
+++ b/Netdisco/lib/Netdisco.pm
@@ -18,7 +18,8 @@ get '/' => sub {
 };
 
 ajax '/ajax/content/search/:thing' => sub {
-    return '<p>Hello World.</p>';
+    content_type('text/html');
+    return '<p>Hello '. param('thing') .'.</p>';
 };
 
 get '/search' => sub {
diff --git a/Netdisco/public/css/style.css b/Netdisco/public/css/style.css
index 3375c1b7..53032bce 100644
--- a/Netdisco/public/css/style.css
+++ b/Netdisco/public/css/style.css
@@ -23,3 +23,11 @@
   padding-left: 35px;
   cursor: default;
 }
+
+.nd_bookmark {
+  vertical-align: top;
+}
+
+.nd_search {
+  margin-top: 15px;
+}
diff --git a/Netdisco/public/images/glyphicons_072_bookmark.png b/Netdisco/public/images/glyphicons_072_bookmark.png
new file mode 100755
index 00000000..35bee51e
Binary files /dev/null and b/Netdisco/public/images/glyphicons_072_bookmark.png differ
diff --git a/Netdisco/views/inc/js/search.js b/Netdisco/views/inc/js/search.js
index 03e519fd..928f53ca 100644
--- a/Netdisco/views/inc/js/search.js
+++ b/Netdisco/views/inc/js/search.js
@@ -4,6 +4,7 @@
     function do_search (event, tab) {
       var form = '#' + tab + '_form';
       var target = '#' + tab + '_pane';
+      var mark = '#' + tab + '_bookmark';
 
       // stop form from submitting normally
       event.preventDefault();
@@ -32,6 +33,8 @@
             );
             return;
           }
+          // looks good, update the bookmark for this search
+          $(mark).attr('href', '/search?' + query);
         }
       );
     }
diff --git a/Netdisco/views/inc/search/box.tt b/Netdisco/views/inc/search/box.tt
new file mode 100644
index 00000000..7fb9adc4
--- /dev/null
+++ b/Netdisco/views/inc/search/box.tt
@@ -0,0 +1,3 @@
+            <div class="clearfix">
+              <input class="span3" name="q" value="[% params.q %]" type="text"/>
+            </div>
diff --git a/Netdisco/views/inc/search/device.tt b/Netdisco/views/inc/search/device.tt
index 1b70da49..dd156384 100644
--- a/Netdisco/views/inc/search/device.tt
+++ b/Netdisco/views/inc/search/device.tt
@@ -1,12 +1,8 @@
         <div id="device_search" class="tab-pane [% 'active' IF params.tab == 'device' %]">
           <form id="device_form" class="nd_sidesearchform form-stacked" method="get" action="/search">
-            <div class="clearfix">
-              <input class="span3" name="q" value="[% params.q %]" type="text"/>
-            </div>
+            [%+ INCLUDE inc/search/box.tt %]
             <p><em>Device Search Options</em></p>
             <input name="tab" value="device" type="hidden"/>
-            <div class="clearfix">
-              <button id="device_submit" type="submit" class="btn info">Search Again</button>
-            </div>
+            [%+ INCLUDE inc/search/submit.tt %]
           </form>
         </div> <!-- /tab-pane -->
diff --git a/Netdisco/views/inc/search/node.tt b/Netdisco/views/inc/search/node.tt
index 149b762e..7e577fe4 100644
--- a/Netdisco/views/inc/search/node.tt
+++ b/Netdisco/views/inc/search/node.tt
@@ -1,8 +1,6 @@
         <div id="node_search" class="tab-pane [% 'active' IF params.tab == 'node' %]">
           <form id="node_form" class="nd_sidesearchform form-stacked" method="get" action="/search">
-            <div class="clearfix">
-              <input class="span3" name="q" value="[% params.q %]" type="text"/>
-            </div>
+            [%+ INCLUDE inc/search/box.tt %]
             <p><em>Node Search Options</em></p>
             <input name="tab" value="node" type="hidden"/>
             <div class="clearfix input-prepend">
@@ -29,8 +27,6 @@
                 <span class="nd_searchcheckbox uneditable-input">Archived Data</span>
               </label>
             </div>
-            <div class="clearfix">
-              <button id="node_submit" type="submit" class="btn info">Search Again</button>
-            </div>
+            [%+ INCLUDE inc/search/submit.tt %]
           </form>
         </div> <!-- /tab-pane -->
diff --git a/Netdisco/views/inc/search/port.tt b/Netdisco/views/inc/search/port.tt
index 0a828721..140b8fb9 100644
--- a/Netdisco/views/inc/search/port.tt
+++ b/Netdisco/views/inc/search/port.tt
@@ -1,11 +1,7 @@
         <div id="port_search" class="tab-pane [% 'active' IF params.tab == 'port' %]">
           <form id="port_form" class="nd_sidesearchform form-stacked" method="get" action="/search">
-            <div class="clearfix">
-              <input class="span3" name="q" value="[% params.q %]" type="text"/>
-            </div>
+            [%+ INCLUDE inc/search/box.tt %]
             <input name="tab" value="vlan" type="hidden"/>
-            <div class="clearfix">
-              <button id="port_submit" type="submit" class="btn info">Search Again</button>
-            </div>
+            [%+ INCLUDE inc/search/submit.tt %]
           </form>
         </div> <!-- /tab-pane -->
diff --git a/Netdisco/views/inc/search/submit.tt b/Netdisco/views/inc/search/submit.tt
new file mode 100644
index 00000000..25f523d7
--- /dev/null
+++ b/Netdisco/views/inc/search/submit.tt
@@ -0,0 +1,4 @@
+            <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>
diff --git a/Netdisco/views/inc/search/vlan.tt b/Netdisco/views/inc/search/vlan.tt
index 30e70115..a26f59ee 100644
--- a/Netdisco/views/inc/search/vlan.tt
+++ b/Netdisco/views/inc/search/vlan.tt
@@ -1,11 +1,7 @@
         <div id="vlan_search" class="tab-pane [% 'active' IF params.tab == 'vlan' %]">
           <form id="vlan_form" class="nd_sidesearchform form-stacked" method="get" action="/search">
-            <div class="clearfix">
-              <input class="span3" name="q" value="[% params.q %]" type="text"/>
-            </div>
+            [%+ INCLUDE inc/search/box.tt %]
             <input name="tab" value="vlan" type="hidden"/>
-            <div class="clearfix">
-              <button id="vlan_submit" type="submit" class="btn info">Search Again</button>
-            </div>
+            [%+ INCLUDE inc/search/submit.tt %]
           </form>
         </div> <!-- /tab-pane -->