diff --git a/Netdisco/Changes b/Netdisco/Changes
index fdcb1866..6e87a96e 100644
--- a/Netdisco/Changes
+++ b/Netdisco/Changes
@@ -4,6 +4,7 @@
 
   * Do not include inventory items which don't have full OS details
   * Hide Legend item relating to port control if not an admin
+  * No-Wrap on port name column
 
 2.004002 - 2013-01-30
 
diff --git a/Netdisco/share/views/ajax/device/ports.tt b/Netdisco/share/views/ajax/device/ports.tt
index 3e407d53..b26a19a6 100644
--- a/Netdisco/share/views/ajax/device/ports.tt
+++ b/Netdisco/share/views/ajax/device/ports.tt
@@ -28,20 +28,20 @@
       [% IF params.c_port %]
       [% IF vars.user.port_control AND params.c_admin %]
       [% IF row.up_admin == 'up' %]
-      <td class="nd_editable_cell" data-action="down"
+      <td nowrap class="nd_editable_cell" data-action="down"
         data-field="c_port" data-for-device="[% device %]" data-for-port="[% row.port | html_entity %]">
         <i class="icon-hand-down nd_hand_icon"
           rel="tooltip" data-placement="top" data-offset="3"
           data-animation="" data-title="Click to Disable"></i>
       [% ELSE %]
-      <td class="nd_editable_cell" data-action="up"
+      <td nowrap class="nd_editable_cell" data-action="up"
         data-field="c_port" data-for-device="[% device %]" data-for-port="[% row.port | html_entity %]">
         <i class="icon-hand-up nd_hand_icon"
           rel="tooltip" data-placement="top" data-offset="3"
           data-animation="" data-title="Click to Enable"></i>
       [% END %]
       [% ELSE %]
-      <td>
+      <td nowrap>
       [% END %]
         <a class="nd_linkcell nd_this_port_only" href="[% uri_for('/device',
             vars.self_options) %]&q=[% params.q | uri %]&f=[% row.port | uri %]">
@@ -50,7 +50,7 @@
       [% END %]
 
       [% IF params.c_descr %]
-      <td class="center_cell">[% row.descr | html_entity %]</td>
+      <td nowrap class="center_cell">[% row.descr | html_entity %]</td>
       [% END %]
 
       [% IF params.c_type %]