2 files changed, 5 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG
index ba6371bad..871bc3174 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -70,6 +70,7 @@ CHANGELOG Roundcube Webmail
 - Fix handling of folders with "<>" characters in name
 - jQuery 1.4.4
 - Fix handling of HTML entity strings in plain text messages
+- Fix focused elements aren't unfocused when clicking on the list (#1487123)
 
 RELEASE 0.4.2
 -------------
diff --git a/program/js/list.js b/program/js/list.js
index aabba0842..406590b4c 100644
--- a/program/js/list.js
+++ b/program/js/list.js
@@ -214,6 +214,7 @@ focus: function(e)
 {
   var id;
   this.focused = true;
+
   for (var n in this.selection) {
     id = this.selection[n];
     if (this.rows[id] && this.rows[id].obj) {
@@ -221,6 +222,9 @@ focus: function(e)
     }
   }
 
+  // Un-focus already focused elements
+  $('*:focus').blur();
+
   if (e || (e = window.event))
     rcube_event.cancel(e);
 },