diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
index 53a041cc6..5e58201c5 100644
--- a/docs/changelog/7.x.x.txt
+++ b/docs/changelog/7.x.x.txt
@@ -10,6 +10,7 @@
  - fixed #11265: typo i18n
  - fixed #11263: CleanLoginHistory can cause workflow errors
  - fixed #11185: Code editor broken in IE8 for SQLReport
+ - fixed #11177: Code editor steals focus on load
 
 7.8.5
  - added the EMS submission subsystem
diff --git a/www/extras/yui-webgui/build/code-editor/code-editor.js b/www/extras/yui-webgui/build/code-editor/code-editor.js
index 972958632..701fb4439 100755
--- a/www/extras/yui-webgui/build/code-editor/code-editor.js
+++ b/www/extras/yui-webgui/build/code-editor/code-editor.js
@@ -43,7 +43,7 @@
             this._getDoc().getElementsByTagName('head')[0].appendChild(link);
             // Highlight the initial value
             if ( this.getEditorText() != this.old_text ) {
-                Lang.later(10, this, this.highlight);
+                Lang.later(10, this, function () { this.highlight(true) } );
                 if ( this.status ) {
                     Lang.later(100, this, this._writeStatus);
                 }