diff --git a/js/functions.js b/js/functions.js
index 12c6a653c7..ed8ebafa6b 100644
--- a/js/functions.js
+++ b/js/functions.js
@@ -1150,8 +1150,25 @@ $(document).ready(function(){
         new_content    += "<input type=\"button\" class=\"btnSave\" value=\"" + PMA_messages['strGo'] + "\">\n";
         new_content    += "<input type=\"button\" class=\"btnDiscard\" value=\"" + PMA_messages['strCancel'] + "\">\n";
         $inner_sql.replaceWith(new_content);
+
+        // These settings are duplicated from the .ready()function in functions.js
+        var height = $('#sql_query_edit').css('height');
+        codemirror_editor = CodeMirror.fromTextArea($('textarea[name="sql_query_edit"]')[0], {
+            lineNumbers: true,
+            matchBrackets: true,
+            indentUnit: 4,
+            mode: "text/x-mysql",
+            lineWrapping: true
+        });
+        codemirror_editor.getScrollerElement().style.height = height;
+        codemirror_editor.refresh();
+
         $(".btnSave").click(function(){
-            var sql_query = $(this).prev().val();
+            if (codemirror_editor !== undefined) {
+                var sql_query = codemirror_editor.getValue();
+            } else {
+                var sql_query = $(this).prev().val();
+            }
             var $fake_form = $('<form>', {action: 'import.php', method: 'post'})
                     .append($form.find("input[name=server], input[name=db], input[name=table], input[name=token]").clone())
                     .append($('<input>', {type: 'hidden', name: 'show_query', value: 1}))
diff --git a/sql.php b/sql.php
index 3e6e6d445f..d736bdf58c 100644
--- a/sql.php
+++ b/sql.php
@@ -20,6 +20,10 @@ $GLOBALS['js_include'][] = 'tbl_change.js';
 // the next one needed because sql.php may do a "goto" to tbl_structure.php
 $GLOBALS['js_include'][] = 'tbl_structure.js';
 $GLOBALS['js_include'][] = 'gis_data_editor.js';
+$GLOBALS['js_include'][] = 'codemirror/lib/codemirror.js';
+$GLOBALS['js_include'][] = 'codemirror/mode/mysql/mysql.js';
+
+
 
 if (isset($_SESSION['profiling'])) {
     $GLOBALS['js_include'][] = 'highcharts/highcharts.js';
diff --git a/test/libraries/common/PMA_extractFieldSpec_test.php b/test/libraries/common/PMA_extractFieldSpec_test.php
index cd2a6cb34b..cb5bb1e8ff 100644
--- a/test/libraries/common/PMA_extractFieldSpec_test.php
+++ b/test/libraries/common/PMA_extractFieldSpec_test.php
@@ -1,4 +1,3 @@
-
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**