diff --git a/CHANGELOG b/CHANGELOG
index ce77daf4b..b4860ad6b 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,7 @@
 CHANGELOG Roundcube Webmail
 ===========================
 
+- Fix missing thread expand icon on search result in widescreen mode (#5613)
 - Fix bug where image data URIs in css style were treated as evil/remote in mail preview (#5580)
 - Fix bug where external content in src attribute of input/video tags was not secured (#5583)
 - Fix PHP error on update of a contact with multiple email addresses when using PHP 7.1 (#5587)
diff --git a/program/steps/mail/search.inc b/program/steps/mail/search.inc
index 25900a5d0..70d617743 100644
--- a/program/steps/mail/search.inc
+++ b/program/steps/mail/search.inc
@@ -157,6 +157,10 @@ $_SESSION['search_scope']    = $scope;
 $_SESSION['search_interval'] = $interval;
 $_SESSION['search_filter']   = $filter;
 
+$OUTPUT->set_env('search_request', $search_str ? $search_request : '');
+$OUTPUT->set_env('search_filter', $_SESSION['search_filter']);
+$OUTPUT->set_env('threading', $RCMAIL->storage->get_threading());
+
 // Get the headers
 if (!$result->incomplete) {
     $result_h = $RCMAIL->storage->list_messages($mbox, 1, $sort_column, rcmail_sort_order());
@@ -201,9 +205,6 @@ else {
 }
 
 // update message count display
-$OUTPUT->set_env('search_request', $search_str ? $search_request : '');
-$OUTPUT->set_env('search_filter', $_SESSION['search_filter']);
-$OUTPUT->set_env('threading', $RCMAIL->storage->get_threading());
 $OUTPUT->set_env('messagecount', $count);
 $OUTPUT->set_env('pagecount', ceil($count/$RCMAIL->storage->get_pagesize()));
 $OUTPUT->set_env('exists', $mbox === null ? 0 : $RCMAIL->storage->count($mbox, 'EXISTS'));