diff --git a/ChangeLog b/ChangeLog
index 67f3701b1..7e2dffc3b 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,6 +9,8 @@ $Source$
     * css/phpmyadmin.css.php: Force <button> to be displayed inline.
     * libraries/common.lib.php: When only_db matches no database, do not show
       any (bug #943626).
+    * css/phpmyadmin.css.php: Not .nowrap, but div.nowrap should have zero
+      margin/padding.
 
 2004-04-28 Garvin Hicking <pma@supergarv.de>
     * left.php, main.php, server_databases.php, common.lib.php,
diff --git a/css/phpmyadmin.css.php b/css/phpmyadmin.css.php
index c1d7c203b..85ec60e87 100644
--- a/css/phpmyadmin.css.php
+++ b/css/phpmyadmin.css.php
@@ -280,6 +280,9 @@ form.clock {
 
 .nowrap {
     white-space: nowrap;
+}
+
+div.nowrap {
     margin: 0px;
     padding: 0px;
 }