diff --git a/libraries/mult_submits.inc.php b/libraries/mult_submits.inc.php
index 4a6ae6616..fb9cb85a2 100644
--- a/libraries/mult_submits.inc.php
+++ b/libraries/mult_submits.inc.php
@@ -298,6 +298,8 @@ elseif ($mult_btn == $strYes) {
         PMA_DBI_free_result($result);
     }
 
+    $rebuild_database_list = false;
+
     for ($i = 0; $i < $selected_cnt; $i++) {
         switch ($query_type) {
             case 'row_delete':
@@ -311,6 +313,7 @@ elseif ($mult_btn == $strYes) {
                            . PMA_backquote(urldecode($selected[$i]));
                 $reload    = 1;
                 $run_parts = TRUE;
+                $rebuild_database_list = true;
                 break;
 
             case 'drop_tbl':
@@ -423,5 +426,10 @@ elseif ($mult_btn == $strYes) {
             unset($sql_query_views);
         }
     }
+    if ($rebuild_database_list) {
+        // avoid a problem with the database list navigator
+        // when dropping a db from server_databases
+        $GLOBALS['PMA_List_Database']->build();
+    }
 }
 ?>