diff --git a/share/views/ajax/admintask/topology.tt b/share/views/ajax/admintask/topology.tt
index 0dcec0aa..510a8c25 100644
--- a/share/views/ajax/admintask/topology.tt
+++ b/share/views/ajax/admintask/topology.tt
@@ -12,13 +12,13 @@
     <tr>
       <td class="nd_center-cell">
         <div class="input-append">
-          <input data-form="add" class="nd_topo_dev nd_topo_dev1" name="dev1"  type="text">
+          <input data-form="add" class="nd_topo_dev nd_topo_dev1" name="dev1" type="text" value="[% params.dev1 | html_entity %]">
           <span class="add-on nd_topo_dev_caret"><i class="icon-caret-down icon-large"></i></span>
         </div>
       </td>
       <td class="nd_center-cell">
         <div class="input-append">
-          <input data-form="add" class="nd_topo_port nd_topo_dev1" name="port1" type="text">
+          <input data-form="add" class="nd_topo_port nd_topo_dev1" name="port1" type="text" value="[% params.port1 | html_entity %]">
           <span class="add-on nd_topo_port_caret"><i class="icon-caret-down icon-large"></i></span>
         </div>
       </td>
diff --git a/share/views/ajax/device/ports.tt b/share/views/ajax/device/ports.tt
index e17da212..7aa67ab3 100644
--- a/share/views/ajax/device/ports.tt
+++ b/share/views/ajax/device/ports.tt
@@ -345,6 +345,14 @@
           [% END %]
         [% END %]
         [% END %]
+        [% IF user_can_port_control AND params.c_admin %]
+        <a class="nd_log-icon"
+          href="[% uri_for('/admin/topology') %]?dev1=[% device.ip | uri %]&port1=[% row.port | uri %]">
+          <i class="icon-bolt"
+            rel="tooltip" data-placement="top" data-offset="3"
+            data-animation="" data-title="Manual Topology"></i>
+        [% END %]
+        </a>
       </td>
       [% END %]
 
diff --git a/share/views/sidebar/admintask/topology.tt b/share/views/sidebar/admintask/topology.tt
new file mode 100644
index 00000000..9ab4a77b
--- /dev/null
+++ b/share/views/sidebar/admintask/topology.tt
@@ -0,0 +1,5 @@
+
+
+            <input name="dev1"  value="[% params.dev1  | html_entity %]" type="hidden"/>
+            <input name="port1" value="[% params.port1 | html_entity %]" type="hidden"/>
+            <script type="text/javascript">has_sidebar["topology"] = 0;</script>