diff --git a/Netdisco/public/css/style.css b/Netdisco/public/css/style.css
index a72e9318..f3c2e4da 100644
--- a/Netdisco/public/css/style.css
+++ b/Netdisco/public/css/style.css
@@ -172,8 +172,8 @@ form .clearfix.success input {
 /* for placing the sidebar toggle icons */
 #sidebar_toggle_img_in {
   position: fixed;
-  top: 55px;
-  left: 25px;
+  top: 60px;
+  left: 205px;
 }
 
 /* for placing the sidebar toggle icons */
diff --git a/Netdisco/views/device.tt b/Netdisco/views/device.tt
index eddfb97a..59eb3f03 100644
--- a/Netdisco/views/device.tt
+++ b/Netdisco/views/device.tt
@@ -6,7 +6,7 @@
     <div class="well">
       <img class="sidebar_toggle" id="sidebar_toggle_img_in"
         src="[% uri_base %]/images/application_side_contract.png"
-        rel="twipsy" data-placement="right" data-offset="5" title="Hide Sidebar"/>
+        rel="twipsy" data-placement="below" data-offset="5" title="Hide Sidebar"/>
       <h3 class="device_label">[% d.ip %]</h3>
       <p class="device_label">[% d.dns.remove(settings.domain_suffix) %]</p>
       <div class="tab-content">
diff --git a/Netdisco/views/js/device.js b/Netdisco/views/js/device.js
index 7487f90b..47ac0b5e 100644
--- a/Netdisco/views/js/device.js
+++ b/Netdisco/views/js/device.js
@@ -114,23 +114,5 @@
     };
     $('.add-on :checkbox').each(syncCheckBox).click(syncCheckBox);
 
-    // sidebar toggle
-    $('#sidebar_toggle_img_in').click(
-      function() {
-        $('.sidebar').toggle(
-          function() {
-            $('#sidebar_toggle_img_out').toggle();
-            $('.nd_content').animate({'margin-left': '5px !important'}, 100);
-          }
-        );
-      }
-    );
-    $('#sidebar_toggle_img_out').click(
-      function() {
-        $('#sidebar_toggle_img_out').toggle();
-        $('.nd_content').animate({'margin-left': '225px !important'}, 200,
-          function() { $('.sidebar').toggle(200) }
-        );
-      }
-    );
+[%+ INCLUDE 'js/sidebar.js' -%]
   });
diff --git a/Netdisco/views/js/search.js b/Netdisco/views/js/search.js
index 8382dfb9..970e0a49 100644
--- a/Netdisco/views/js/search.js
+++ b/Netdisco/views/js/search.js
@@ -104,4 +104,6 @@
         $(this).parent(".clearfix").addClass('success');
       }
     });
+
+[%+ INCLUDE 'js/sidebar.js' -%]
   });
diff --git a/Netdisco/views/js/sidebar.js b/Netdisco/views/js/sidebar.js
new file mode 100644
index 00000000..775960ab
--- /dev/null
+++ b/Netdisco/views/js/sidebar.js
@@ -0,0 +1,23 @@
+    // sidebar toggle
+    $('#sidebar_toggle_img_in').click(
+      function() {
+        $('#sidebar_toggle_img_in').toggle();
+        $('.sidebar').toggle(
+          function() {
+            $('#sidebar_toggle_img_out').toggle();
+            $('.nd_content').animate({'margin-left': '5px !important'}, 100);
+          }
+        );
+      }
+    );
+    $('#sidebar_toggle_img_out').click(
+      function() {
+        $('#sidebar_toggle_img_out').toggle();
+        $('.nd_content').animate({'margin-left': '225px !important'}, 200,
+          function() {
+            $('.sidebar').toggle(200);
+            $('#sidebar_toggle_img_in').toggle();
+          }
+        );
+      }
+    );
diff --git a/Netdisco/views/search.tt b/Netdisco/views/search.tt
index cc623fec..532abe35 100644
--- a/Netdisco/views/search.tt
+++ b/Netdisco/views/search.tt
@@ -1,6 +1,12 @@
+<img class="sidebar_toggle" id="sidebar_toggle_img_out"
+  src="[% uri_base %]/images/application_side_expand.png"
+  rel="twipsy" data-placement="right" data-offset="5" title="Show Sidebar"/>
 <div class="container-fluid">
   <div class="sidebar">
     <div class="well">
+      <img class="sidebar_toggle" id="sidebar_toggle_img_in"
+        src="[% uri_base %]/images/application_side_contract.png"
+        rel="twipsy" data-placement="below" data-offset="5" title="Hide Sidebar"/>
       <div class="tab-content">
         [% FOREACH tab IN vars.tabs %]
         <div id="[% tab.id %]_search" class="tab-pane [% 'active' IF params.tab == tab.id %]">