diff --git a/js/functions.js b/js/functions.js
index e8041ec07c..81953275f1 100644
--- a/js/functions.js
+++ b/js/functions.js
@@ -3379,12 +3379,13 @@ AJAX.registerOnload('functions.js', function() {
             matchBrackets: true,
             indentUnit: 4,
             mode: "text/x-mysql",
-            lineWrapping: true,
-            onKeyEvent: function (inst, e) {
-                if (e.type == 'keydown' && e.ctrlKey && (e.keyCode == 13 || e.keyCode == 10)) {
-                    $("#button_submit_query").submit();
-                    return false;
-                }
+            lineWrapping: true
+        });
+        codemirror_wrapper_element = codemirror_editor.getWrapperElement();
+        $(codemirror_wrapper_element).bind('keypress', function (e) {
+            if (e.ctrlKey && (e.keyCode == 13 || e.keyCode == 10)) { // ctrl-enter is 10 in chrome and ie, but 13 in ff
+                $("#button_submit_query").submit();
+                return false;
             }
         });
         codemirror_editor.focus();