diff --git a/js/src/functions.js b/js/src/functions.js
index a4cd5469da..5ab02dc75b 100644
--- a/js/src/functions.js
+++ b/js/src/functions.js
@@ -3855,7 +3855,7 @@ Functions.indexEditorDialog = function (url, title, callbackSuccess, callbackFai
                 }
                 $('div.no_indexes_defined').hide();
                 if (callbackSuccess) {
-                    callbackSuccess();
+                    callbackSuccess(data);
                 }
                 Navigation.reload();
             } else {
diff --git a/js/src/indexes.js b/js/src/indexes.js
index d84790acde..f8766fb23c 100644
--- a/js/src/indexes.js
+++ b/js/src/indexes.js
@@ -708,7 +708,9 @@ AJAX.registerOnload('indexes.js', function () {
             title = Messages.strEditIndex;
         }
         url += CommonParams.get('arg_separator') + 'ajax_request=true';
-        Functions.indexEditorDialog(url, title, function () {
+        Functions.indexEditorDialog(url, title, function (data) {
+            CommonParams.set('db', data.params.db);
+            CommonParams.set('table', data.params.table);
             CommonActions.refreshMain('index.php?route=/table/structure');
         });
     });