Fix focus on the list when list row is clicked (#1488600)

2 files changed, 2 insertions, 1 deletions

diff --git a/CHANGELOG b/CHANGELOG
index c4edda711..1e7fd6768 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,7 @@
 CHANGELOG Roundcube Webmail
 ===========================
 
+- Fix focus on the list when list row is clicked (#1488600)
 - Added separate From and To columns apart from smart From/To column (#1486891)
 - Fix fallback to Larry skin when configured skin isn't available (#1488591)
 - Fix (workaround) delete operations with some versions of memcache (#1488592)
diff --git a/program/js/list.js b/program/js/list.js
index 9f5ae3c65..0b640c74b 100644
--- a/program/js/list.js
+++ b/program/js/list.js
@@ -234,7 +234,7 @@ focus: function(e)
   }
 
   // Un-focus already focused elements
-  $('*:focus', window).blur();
+  $(document.activeElement).blur();
   $('iframe').each(function() { this.blur(); });
 
   if (e || (e = window.event))