diff --git a/ChangeLog b/ChangeLog
index 48f101aab..86b53462c 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,10 @@ phpMyAdmin - Changelog
 $Id$
 $Source$
 
+2006-03-16 Michal Čihař  <michal@cihar.com>
+    *  libraries/select_server.lib.php: Move end of fieldset to correct place
+       after button (patch #1450559).
+
 2006-03-15 Michal Čihař  <michal@cihar.com>
     * libraries/export/htmlexcel.php: Fix output handling (bug #1450555).
 
diff --git a/libraries/select_server.lib.php b/libraries/select_server.lib.php
index d0a881676..e48b51ff4 100644
--- a/libraries/select_server.lib.php
+++ b/libraries/select_server.lib.php
@@ -95,11 +95,6 @@ function PMA_select_server($not_only_options, $ommit_fieldset)
 
     if ($not_only_options) {
         echo '</select>';
-        if ($ommit_fieldset) {
-            echo '<hr />';
-        } else {
-            echo '</fieldset>';
-        }
         ?>
         <input type="hidden" name="lang" value="<?php echo $lang; ?>" />
         <input type="hidden" name="convcharset" value="<?php echo $convcharset; ?>" />
@@ -108,6 +103,11 @@ function PMA_select_server($not_only_options, $ommit_fieldset)
         echo '<noscript>';
         echo '<input type="submit" value="' . $GLOBALS['strGo'] . '" />';
         echo '</noscript>';
+        if ($ommit_fieldset) {
+            echo '<hr />';
+        } else {
+            echo '</fieldset>';
+        }
         echo '</form>';
     } elseif ($list) {
         // TODO FIXME display server list as 'list'