diff --git a/Netdisco/share/views/ajax/admintask/topology.tt b/Netdisco/share/views/ajax/admintask/topology.tt
index c87d77cd..40e12b14 100644
--- a/Netdisco/share/views/ajax/admintask/topology.tt
+++ b/Netdisco/share/views/ajax/admintask/topology.tt
@@ -11,10 +11,30 @@
   </tbody>
     <tr>
       <form name="add">
-      <td class="center_cell"><input class="nd_topo_dev  nd_topo_dev1" name="dev1"  type="text"></td>
-      <td class="center_cell"><input class="nd_topo_port nd_topo_dev1" name="port1" type="text"></td>
-      <td class="center_cell"><input class="nd_topo_dev  nd_topo_dev2" name="dev2"  type="text"></td>
-      <td class="center_cell"><input class="nd_topo_port nd_topo_dev2" name="port2" type="text"></td>
+      <td class="center_cell">
+        <div class="input-append">
+          <input class="nd_topo_dev nd_topo_dev1" name="dev1"  type="text">
+          <span class="add-on nd_topo_dev_caret"><i class="icon-caret-down icon-large"></i></span>
+        </div>
+      </td>
+      <td class="center_cell">
+        <div class="input-append">
+          <input class="nd_topo_port nd_topo_dev1" name="port1" type="text">
+          <span class="add-on nd_topo_port_caret"><i class="icon-caret-down icon-large"></i></span>
+        </div>
+      </td>
+      <td class="center_cell">
+        <div class="input-append">
+          <input class="nd_topo_dev nd_topo_dev2" name="dev2"  type="text">
+          <span class="add-on nd_topo_dev_caret"><i class="icon-caret-down icon-large"></i></span>
+        </div>
+      </td>
+      <td class="center_cell">
+        <div class="input-append">
+          <input class="nd_topo_port nd_topo_dev2" name="port2" type="text">
+          <span class="add-on nd_topo_port_caret"><i class="icon-caret-down icon-large"></i></span>
+        </div>
+      </td>
       <td class="center_cell">
         <button class="btn btn-small" name="add" type="submit"><i class="icon-plus-sign"></i> Add</button>
       </td>
diff --git a/Netdisco/share/views/js/admintask.js b/Netdisco/share/views/js/admintask.js
index c87cd0af..dac715dd 100644
--- a/Netdisco/share/views/js/admintask.js
+++ b/Netdisco/share/views/js/admintask.js
@@ -15,6 +15,7 @@
 
     // get all devices on device input focus
     $(".nd_topo_dev").on('focus', function(e) { $(this).autocomplete('search', '%') });
+    $(".nd_topo_dev_caret").on('click', function(e) { $(this).siblings('.nd_topo_dev').autocomplete('search', '%') });
 
     // activate typeahead on the topo boxes
     $('.nd_topo_port.nd_topo_dev1').autocomplete({
@@ -40,6 +41,7 @@
 
     // get all ports on port input focus
     $(".nd_topo_port").on('focus', function(e) { $(this).autocomplete('search') });
+    $(".nd_topo_port_caret").on('click', function(e) { $(this).siblings('.nd_topo_port').autocomplete('search') });
 
     // activity for admin task tables
     // dynamically bind to all forms in the table