diff --git a/CHANGELOG b/CHANGELOG
index bc4d97a98..233b4b898 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -8,6 +8,7 @@ CHANGELOG Roundcube Webmail
 - Password: Added 'modoboa' driver (#6361)
 - Password: Fix bug where password_dovecotpw_with_method setting could be ignored (#6436)
 - Elastic: Improved UX of search dialogs (#6416)
+- Elastic: Fix unwanted thread expanding when selecting a collapsed thread in non-mobile mode (#6445)
 - Fix so invalid smtp_helo_host is never used, fallback to localhost (#6408)
 - Fix custom logo size in Elastic (#6424)
 - Fix listing the same attachment multiple times on forwarded messages
diff --git a/skins/elastic/ui.js b/skins/elastic/ui.js
index 647f2c870..2cba1727c 100644
--- a/skins/elastic/ui.js
+++ b/skins/elastic/ui.js
@@ -1101,7 +1101,9 @@ function rcube_elastic_ui()
         // display or reset the content frame
         var common_content_handler = function(e, href, show, title)
         {
-            content_frame_navigation(href, e);
+            if (is_mobile()) {
+                content_frame_navigation(href, e);
+            }
 
             if (show && !layout.content.is(':visible')) {
                 env.last_selected = layout.content[0];