diff --git a/ChangeLog b/ChangeLog
index 8591eb7eb..80b3cd9c2 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -18,6 +18,8 @@ $Source$
     * mult_submits.inc.php, tbl_properties_structure.php: Allow index creating
       on multiple fields (RFE #990136).
     * db_operations.php: Duplicate create new table dialog (see RFE #808029).
+    * main.php: Don't display server choice here, if also in left frame (RFE
+      #984153).
 
 2004-10-20 Marc Delisle  <lem9@users.sourceforge.net>
     * libraries/common.lib.php: there was already a tip icon in our collection,
diff --git a/main.php b/main.php
index db164fcea..70c9e8c9e 100644
--- a/main.php
+++ b/main.php
@@ -147,8 +147,10 @@ if (($server > 0) && isset($mode) && ($mode == 'reload')) {
 /**
  * Displays the MySQL servers choice form
  */
-$show_server_left = FALSE;
-include('./libraries/select_server.lib.php');
+if (!$cfg['LeftDisplayServers']) {
+    $show_server_left = FALSE;
+    include('./libraries/select_server.lib.php');
+}
 
 // neted table needed
 ?>