diff --git a/ChangeLog b/ChangeLog
index af30b7482..1fe5261d7 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,10 @@ phpMyAdmin - Changelog
 $Id$
 $Source$
 
+2005-10-04 Sebastian Mendel <cybot_tm@users.sourceforge.net>
+    * libraries/functions.js, libraries/sql_query_form.lib.php:
+      fixed JavaScript malfunction in querybox textarea with Opera
+
 2005-10-03 Marc Delisle  <lem9@users.sourceforge.net>
     * server_privileges.php: support for Execute_priv
 
diff --git a/libraries/functions.js b/libraries/functions.js
index 789ab455c..fa659c7e6 100644
--- a/libraries/functions.js
+++ b/libraries/functions.js
@@ -1,5 +1,37 @@
 /* $Id$ */
 
+/**
+ * @var sql_box_locked lock for the sqlbox textarea in the querybox/querywindow
+ */
+var sql_box_locked = false;
+
+/**
+ * @var array holds elements which content should only selected once
+ */
+var only_once_elements = new Array();
+
+/**
+ * selects the content of a given object, f.e. a textarea
+ *
+ * @param   object  element     element of which the content will be selected
+ * @param   var     lock        variable which holds the lock for this element
+ *                              or true, if no lock exists
+ * @param   boolean only_once   if true this is only done once
+ *                              f.e. only on first focus
+ */
+function selectContent( element, lock, only_once ) {
+	if ( only_once && only_once_elements[element.name] ) {
+		return;
+	}
+	
+	only_once_elements[element.name] = true;
+	
+	if ( lock  ) {
+		return;
+	}	
+	
+    element.select();
+}
 
 /**
  * Displays an confirmation box before to submit a "DROP DATABASE" query.
@@ -822,6 +854,7 @@ function insertValueQuery() {
     var myListBox = document.sqlform.dummy;
 
     if(myListBox.options.length > 0) {
+    	sql_box_locked = true;
         var chaineAj = "";
         var NbSelect = 0;
         for(var i=0; i<myListBox.options.length; i++) {
@@ -850,6 +883,7 @@ function insertValueQuery() {
         } else {
             myQuery.value += chaineAj;
         }
+    	sql_box_locked = false;
     }
 }
 
diff --git a/libraries/sql_query_form.lib.php b/libraries/sql_query_form.lib.php
index 5aa3ad149..19d6c7f1b 100644
--- a/libraries/sql_query_form.lib.php
+++ b/libraries/sql_query_form.lib.php
@@ -188,9 +188,7 @@ function PMA_sqlQueryFormInsert( $query = '', $is_querywindow = false ) {
     
     // enable auto select text in textarea
     if ( $GLOBALS['cfg']['TextareaAutoSelect'] ) {
-        $auto_sel = ' onfocus="if (typeof(document.layers) == \'undefined\' || '
-            .' typeof(textarea_selected) == \'undefined\') {textarea_selected '
-            .'= 1; this.form.elements[\'sql_query\'].select();}"';
+        $auto_sel = ' onfocus="selectContent( this, sql_box_locked, true )"';
     } else {
         $auto_sel = '';
     }