diff --git a/ChangeLog b/ChangeLog
index 2e518d5468..2fd1f48a52 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -14,6 +14,7 @@ phpMyAdmin - ChangeLog
 + Add enforcement of the minimum supported PHP version (5.3.0)
 - bug       Query error on submitting a column change form containing a disabled input field
 - bug       Incorrect menu tab generation from usergroups
+- bug       Missing space in index creation/edit generated query
 
 4.2.2.0 (2014-05-20)
 - bug #4388 Disable database expansion when enabled throws Error 500 when database name is clicked in navigation tree
diff --git a/libraries/tbl_indexes.lib.php b/libraries/tbl_indexes.lib.php
index 04e09a1cdb..5c1b1de962 100644
--- a/libraries/tbl_indexes.lib.php
+++ b/libraries/tbl_indexes.lib.php
@@ -142,7 +142,7 @@ function PMA_getSqlQueryForIndexCreateOrEdit($db, $table, $index, &$error)
     }
 
     if (PMA_MYSQL_INT_VERSION > 50500) {
-        $sql_query .= "COMMENT '"
+        $sql_query .= " COMMENT '"
             . PMA_Util::sqlAddSlashes($index->getComment())
             . "'";
     }