diff --git a/db_operations.php b/db_operations.php
index 9682498d7f..6d0db1982a 100644
--- a/db_operations.php
+++ b/db_operations.php
@@ -172,6 +172,7 @@ if (strlen($db)
             'sql_query',
             PMA_Util::getMessage(null, $sql_query)
         );
+        $response->addJSON('db', $db);
         exit;
     }
 }
diff --git a/js/db_operations.js b/js/db_operations.js
index 2ae779557f..763040bc4f 100644
--- a/js/db_operations.js
+++ b/js/db_operations.js
@@ -79,13 +79,13 @@ AJAX.registerOnload('db_operations.js', function () {
             // use messages that stay on screen
             $('div.success, div.error').fadeOut();
             if (data.success === true) {
-                PMA_commonParams.set('db', data.newname);
                 if ($("#checkbox_switch").is(":checked")) {
                     PMA_commonParams.set('db', data.newname);
                     PMA_commonActions.refreshMain(false, function () {
                         PMA_ajaxShowMessage(data.message);
                     });
                 } else {
+                    PMA_commonParams.set('db', data.db);
                     PMA_ajaxShowMessage(data.message);
                 }
                 PMA_reloadNavigation();