diff --git a/Netdisco/share/public/css/netdisco.css b/Netdisco/share/public/css/netdisco.css
index d736bb83..9f280171 100644
--- a/Netdisco/share/public/css/netdisco.css
+++ b/Netdisco/share/public/css/netdisco.css
@@ -267,7 +267,6 @@ td > form.nd_inline-form {
   cursor: pointer;
   float: right;
   display: none;
-  margin-top: 3px;
 }
 
 /* port admin log view */
diff --git a/Netdisco/share/views/ajax/device/ports.tt b/Netdisco/share/views/ajax/device/ports.tt
index 217f1e4a..b5e4ffcc 100644
--- a/Netdisco/share/views/ajax/device/ports.tt
+++ b/Netdisco/share/views/ajax/device/ports.tt
@@ -82,10 +82,6 @@
             rel="tooltip" data-placement="top" data-offset="3"
             data-animation="" data-title="Enable Port"></i>
         </span>
-      [% END %]
-      [% ELSE %]
-      <td nowrap class="nd_editable-cell"
-        data-order="[% row.port | html_entity %]" data-filter="[% row.port | html_entity %]">
       [% END %]
         <a class="nd_log-icon"
           href="[% uri_for('/report/portlog') %]?q=[% device.ip | uri %]&f=[% row.port | uri %]">
@@ -93,6 +89,9 @@
             rel="tooltip" data-placement="top" data-offset="3"
             data-animation="" data-title="View Port Log"></i>
         </a>
+      [% ELSE %]
+      <td nowrap data-order="[% row.port | html_entity %]" data-filter="[% row.port | html_entity %]">
+      [% END %]
         <a class="nd_this-port-only nd_port-only-first" href="[% uri_for('/device',
             self_options) %]&q=[% params.q | uri %]&f=[% row.port | uri %]&prefer=port">
           [% IF row.is_master %]