diff --git a/ChangeLog b/ChangeLog
index 1f945db6f..5aede20fc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,7 @@
 - bug #3301249 [interface] Iconic table operations does not remove inline edit label
 - bug #3303869 [interface] Unnecessary scrolling on Databases page
 - patch #3303813 [setup] Define a label that was missing
+- bug #3305606 [interface] Show all button wraps on privileges page
 
 3.4.1.0 (2011-05-20)
 - bug #3301108 [interface] Synchronize and already configured host
diff --git a/server_privileges.php b/server_privileges.php
index 11714c4cb..7e60f0970 100644
--- a/server_privileges.php
+++ b/server_privileges.php
@@ -1159,7 +1159,7 @@ if (!empty($update_privs)) {
         $sql_query2 .= ';';
     }
     if (! PMA_DBI_try_query($sql_query0)) {
-        // This might fail when the executing user does not have ALL PRIVILEGES himself. 
+        // This might fail when the executing user does not have ALL PRIVILEGES himself.
         // See https://sourceforge.net/tracker/index.php?func=detail&aid=3285929&group_id=23067&atid=377408
         $sql_query0 = '';
     }
@@ -1580,7 +1580,7 @@ if (empty($_REQUEST['adduser']) && (! isset($checkprivs) || ! strlen($checkprivs
                         echo '<td>' . $tmp_initial . '</td>';
                     }
                 }
-                echo '<td><a href="server_privileges.php?' . $GLOBALS['url_query'] . '&amp;showall=1">[' . __('Show all') . ']</a></td>' . "\n";
+                echo '<td><a href="server_privileges.php?' . $GLOBALS['url_query'] . '&amp;showall=1" class="nowrap">[' . __('Show all') . ']</a></td>' . "\n";
                 echo '</tr></table>';
             }