diff --git a/ChangeLog b/ChangeLog
index d9ad90b27..f7026632e 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,9 @@ phpMyAdmin - Changelog
 $Id$
 $Source$
 
+2004-04-28 Michal Cihar  <michal@cihar.com>
+    * css/phpmyadmin.css.php: Force <button> to be displayed inline.
+
 2004-04-28 Garvin Hicking <pma@supergarv.de>
     * left.php, libraries/left.js: Fixed unneeded spacing between items
       and wrong collapsion in nested mode (Bug #943140). Removed
diff --git a/css/phpmyadmin.css.php b/css/phpmyadmin.css.php
index 4bd9200ee..c1d7c203b 100644
--- a/css/phpmyadmin.css.php
+++ b/css/phpmyadmin.css.php
@@ -302,3 +302,8 @@ ul.main li {
     list-style-image: url(../images/item_<?php echo $text_dir; ?>.png);
     padding-bottom: 0.1em;
 }
+
+button {
+    /* buttons in some browsers (eg. Konqueror) are block elements, this breaks design */
+    display: inline;
+}