diff --git a/ChangeLog b/ChangeLog
index 974984b01..c01bb5da3 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,9 @@ phpMyAdmin - Changelog
 $Id$
 $Source$
 
+2005-11-25 Marc Delisle  <lem9@users.sourceforge.net>
+    * main.php: move server choice into MySQL container
+
 2005-11-24 Sebastian Mendel <cybot_tm@users.sourceforge.net>
     * libraries/url_generating.lib.php:
       - do not htmlentities on whole string
diff --git a/main.php b/main.php
index 7eb0e6ee3..fa1be507a 100644
--- a/main.php
+++ b/main.php
@@ -33,14 +33,6 @@ if ( ! empty( $message ) ) {
     unset( $message );
 }
 
-/**
- * Displays the MySQL servers choice form
- */
-if (!$cfg['LeftDisplayServers'] && count($cfg['Servers']) > 1) {
-    include('./libraries/select_server.lib.php');
-    PMA_select_server(TRUE, FALSE);
-}
-
 $common_url_query =  PMA_generate_common_url( '', '' );
 
 // this div is required for containing divs can be 50%
@@ -85,6 +77,14 @@ if ( $server > 0 ) {
     echo '<h1 xml:lang="en" dir="ltr">MySQL - ' . PMA_MYSQL_STR_VERSION
         .'</h1>' . "\n";
 
+    /**
+     * Displays the MySQL servers choice form
+     */
+    if (!$cfg['LeftDisplayServers'] && count($cfg['Servers']) > 1) {
+        include('./libraries/select_server.lib.php');
+        PMA_select_server(TRUE, FALSE);
+    }
+
     echo '<ul>' . "\n";
 
     PMA_printListItem( $strProtocolVersion . ': ' . PMA_DBI_get_proto_info()