diff --git a/ChangeLog b/ChangeLog
index 43dc0d895..5f3291fa6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -113,6 +113,7 @@ $Id$
 - bug #3036132 [core] Triggers not fetched if dbname has an hyphen
 - patch #3039269 [dbi] Wrong variable checked for nopassword option,
   thanks to Will Palmer - wpalmer
+- bug #3040226 [XHTML] LockFromUpdate checkbox not checked by default
 
 3.3.5.0 (2010-07-26)
 - patch #2932113 [information_schema] Slow export when having lots of
diff --git a/libraries/sql_query_form.lib.php b/libraries/sql_query_form.lib.php
index 728c12c48..d93869933 100644
--- a/libraries/sql_query_form.lib.php
+++ b/libraries/sql_query_form.lib.php
@@ -355,7 +355,7 @@ function PMA_sqlQueryFormInsert($query = '', $is_querywindow = false, $delimiter
         ?>
         <script type="text/javascript">
         //<![CDATA[
-            document.writeln(' <input type="checkbox" name="LockFromUpdate" value="1" tabindex="120" id="checkbox_lock" /> <label for="checkbox_lock"><?php echo __('Do not overwrite this query from outside the window'); ?></label> ');
+            document.writeln(' <input type="checkbox" name="LockFromUpdate" checked="checked" tabindex="120" id="checkbox_lock" /> <label for="checkbox_lock"><?php echo __('Do not overwrite this query from outside the window'); ?></label> ');
         //]]>
         </script>
         <?php