diff --git a/js/functions.js b/js/functions.js
index f03b9e3ff..381f6a6bb 100644
--- a/js/functions.js
+++ b/js/functions.js
@@ -1725,5 +1725,6 @@ $(document).ready(function(){
         insertQuery(evt.target.id);
         return false;
     });
+    $('#sqlquery').focus();
 });
 
diff --git a/libraries/sql_query_form.lib.php b/libraries/sql_query_form.lib.php
index a29f227c4..52de14936 100644
--- a/libraries/sql_query_form.lib.php
+++ b/libraries/sql_query_form.lib.php
@@ -305,12 +305,6 @@ function PMA_sqlQueryFormInsert($query = '', $is_querywindow = false, $delimiter
     }
     echo '</div>' . "\n";
 
-    echo '<script type="text/javascript">' . "\n"
-        .'//<![CDATA[' . "\n"
-        .'document.getElementById("sqlquery").focus();' . "\n"
-        .'//]]>' . "\n"
-        .'</script>' . "\n";
-
     if (count($fields_list)) {
         echo '<div id="tablefieldscontainer">' . "\n"
             .'<label>' . __('Columns') . '</label>' . "\n"