diff --git a/CHANGELOG b/CHANGELOG
index d48c0d0ce..bbbd1f7bf 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -36,6 +36,7 @@ CHANGELOG Roundcube Webmail
 - Elastic: Fix keyboard navigation in some menus, e.g. the contact menu
 - Elastic: Fix visual issue with long buttons in .boxwarning (#6797)
 - Elastic: Fix handling new-line in text pasted to a recipient input
+- Elastic: Fix so search is not reset when returning from the message preview page (#6847)
 - Larry: Fix regression where menu actions didn't work with keyboard (#6740)
 - ACL: Display user/group names (from ldap) instead of acl identifier
 - Password: Added ldap_exop driver (#4992)
diff --git a/skins/elastic/ui.js b/skins/elastic/ui.js
index 50db96f2c..ad41643c8 100644
--- a/skins/elastic/ui.js
+++ b/skins/elastic/ui.js
@@ -672,12 +672,6 @@ function rcube_elastic_ui()
 
         if (rcmail.task == 'mail') {
             if (rcmail.env.action == 'compose') {
-                // In compose window we do not provide "Back' button, instead
-                // we modify the Mail button in the task menu to act like it (i.e. calls 'list' command)
-                if (!rcmail.env.extwin) {
-                    $('a.mail', layout.menu).attr('onclick', "return rcmail.command('list','',this,event)");
-                }
-
                 rcmail.addEventListener('compose-encrypted', function(e) {
                     $("a.mode-html, button.attach").prop('disabled', e.active);
                     $('a.attach, a.responses')[e.active ? 'addClass' : 'removeClass']('disabled');
@@ -700,6 +694,12 @@ function rcube_elastic_ui()
                 }
             }
 
+            // In compose/preview window we do not provide "Back' button, instead
+            // we modify the Mail button in the task menu to act like it (i.e. calls 'list' command)
+            if (!rcmail.env.extwin && (rcmail.env.action == 'compose' || rcmail.env.action == 'show')) {
+                $('a.mail', layout.menu).attr('onclick', "return rcmail.command('list','',this,event)");
+            }
+
             // Append contact menu to all mailto: links
             if (rcmail.env.action == 'preview' || rcmail.env.action == 'show') {
                 $('a').filter('[href^="mailto:"]').each(function() {