Index: program/js/editor.js
===================================================================
--- program/js/editor.js	(revision eb9eff07115b6b54bbd343d345189a6861e0ae78)
+++ program/js/editor.js	(revision 882b0f5e7f3514d56649923b02583149d80af56b)
@@ -55,6 +55,6 @@
       spellchecker_rpc_url : '?_task=utils&_action=spell&tiny=1',
       gecko_spellcheck : true,
+      remove_script_host : false,
       relative_urls : false,
-      remove_script_host : false,
       rc_client : rcmail,
       oninit : 'rcmail_editor_callback'
@@ -66,6 +66,9 @@
 {
   var editor, elem = rcube_find_object('_from');
-  if (elem && elem.type=='select-one')
+  if (elem && elem.type=='select-one') {
     rcmail.change_identity(elem);
+    // Focus previously focused element
+    rcmail.env.compose_focus_elem.focus();
+  }
   // set tabIndex and set focus to element that was focused before
   rcmail_editor_tabindex(rcmail.env.compose_focus_elem && rcmail.env.compose_focus_elem.id == rcmail.env.composebody);