diff --git a/ChangeLog b/ChangeLog
index 2e33d9af6c..70a50474bf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -63,6 +63,7 @@ phpMyAdmin - ChangeLog
 - issue #12826 Honor user configured connection collation
 - issue #12293 Correctly report OpenSSL errors from cookie encryption
 - issue #12814 DateTime won't allow to input length in Routine editor
+- issue #12841 Fixed moving of columns with whitespace in name
 
 4.6.5.2 (2016-12-05)
 - issue #12765 Fixed SQL export with newlines
diff --git a/js/tbl_structure.js b/js/tbl_structure.js
index 48ef934855..8999aea700 100644
--- a/js/tbl_structure.js
+++ b/js/tbl_structure.js
@@ -364,7 +364,7 @@ AJAX.registerOnload('tbl_structure.js', function () {
                     for (var i in data.columns) {
                         var the_column = data.columns[i];
                         var $the_row = $rows
-                            .find("input:checkbox[value=" + the_column + "]")
+                            .find("input:checkbox[value='" + the_column + "']")
                             .closest("tr");
                         // append the row for this column to the table
                         $fields_table.append($the_row);