- Fix cursor position on compose form in Webkit browsers (#1486674)

2 files changed, 4 insertions, 1 deletions

diff --git a/CHANGELOG b/CHANGELOG
index 4eabb8831..2bc0b5539 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -5,6 +5,7 @@ CHANGELOG Roundcube Webmail
 - Fix attachments of type message/rfc822 are not listed on attachments list
 - Add 'login_lc' config option for case-insensitive authentication (#1487113)
 - Fix window is blur'ed in IE when selecting a message (#1487316)
+- Fix cursor position on compose form in Webkit browsers (#1486674)
 
 RELEASE 0.5-BETA
 ----------------
diff --git a/program/js/editor.js b/program/js/editor.js
index 2ee4ac1ce..3845e3de4 100644
--- a/program/js/editor.js
+++ b/program/js/editor.js
@@ -71,8 +71,10 @@ function rcmail_editor_callback()
   if (elem && elem.type == 'select-one') {
     rcmail.change_identity(elem);
     // Focus previously focused element
-    if (fe && fe.id != rcmail.env.composebody)
+    if (fe && fe.id != rcmail.env.composebody) {
+      window.focus(); // for WebKit (#1486674)
       fe.focus();
+    }
   }
 
   // set tabIndex and set focus to element that was focused before