diff --git a/ChangeLog b/ChangeLog
index 80a8031b64..c26bbe6e98 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,7 @@ phpMyAdmin - ChangeLog
 4.1.3.0 (not yet released)
 - bug #3938 PDFDefaultPageSize doc and easy configurability
 - bug #4198 Hovering over pie chart gives fatal JS error
+- bug #4200 Missing syntax highlighting
 
 4.1.2.0 (2013-12-23)
 - bug #4178 Quick edit for BIT type does not work
diff --git a/js/makegrid.js b/js/makegrid.js
index 9a3b5e0c82..ad5b6935ee 100644
--- a/js/makegrid.js
+++ b/js/makegrid.js
@@ -1273,6 +1273,7 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi
                             if (typeof data.sql_query != 'undefined') {
                                 // display feedback
                                 $('#sqlqueryresults').prepend(data.sql_query);
+                                PMA_highlightSQL($('#result_query'));
                             }
                             // hide and/or update the successfully saved cells
                             g.hideEditCell(true, data);
diff --git a/js/sql.js b/js/sql.js
index 0e0ea829eb..3090ecd522 100644
--- a/js/sql.js
+++ b/js/sql.js
@@ -289,6 +289,7 @@ AJAX.registerOnload('sql.js', function () {
                      .show()
                      .html(data.message);
                 }
+                PMA_highlightSQL($('#result_query'));
 
                 if (typeof data.ajax_reload != 'undefined') {
                     if (data.ajax_reload.reload) {