diff --git a/js/functions.js b/js/functions.js
index 6dc19e72ea..bdd89fa5a3 100644
--- a/js/functions.js
+++ b/js/functions.js
@@ -422,9 +422,8 @@ function checkSqlQuery(theForm)
     isEmpty = 1;
 
     if (isEmpty) {
-        sqlQuery.select();
         alert(PMA_messages.strFormEmpty);
-        sqlQuery.focus();
+        codemirror_editor.focus();
         return false;
     }