diff --git a/ChangeLog b/ChangeLog
index 2d69997437..39c5acc45a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -35,6 +35,7 @@ phpMyAdmin - ChangeLog
 - issue #13475 Fixed export without backquotes
 - issue #13482 Improved handling of uploaded files with open_basedir
 - issue #13387 Fixed inline editing of hex values
+- issue #13382 Fixed size of index edit dialog
 
 4.7.2 (2017-06-29)
 - issue #13314 Make theme selection keep current server
diff --git a/js/functions.js b/js/functions.js
index ae03308dbf..174a85d909 100644
--- a/js/functions.js
+++ b/js/functions.js
@@ -3888,8 +3888,7 @@ function indexEditorDialog(url, title, callback_success, callback_failure)
             .append(data.message)
             .dialog({
                 title: title,
-                width: 450,
-                height: 350,
+                width: 'auto',
                 open: PMA_verifyColumnsProperties,
                 modal: true,
                 buttons: button_options,