diff --git a/app/src/main/java/com/infomaniak/mail/ui/main/search/SearchFragment.kt b/app/src/main/java/com/infomaniak/mail/ui/main/search/SearchFragment.kt
index 4d4e97e9bc..3c6bb01ebb 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/main/search/SearchFragment.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/main/search/SearchFragment.kt
@@ -162,9 +162,7 @@ class SearchFragment : TwoPaneFragment() {
             },
         )
 
-        binding.mailRecyclerView.adapter = threadListAdapter.apply {
-            stateRestorationPolicy = StateRestorationPolicy.PREVENT_WHEN_EMPTY
-        }
+        threadListAdapter.stateRestorationPolicy = StateRestorationPolicy.PREVENT_WHEN_EMPTY
     }
 
     private fun setupListeners() = with(binding) {
@@ -265,6 +263,8 @@ class SearchFragment : TwoPaneFragment() {
 
     private fun setMessagesUi() {
         binding.mailRecyclerView.apply {
+            adapter = threadListAdapter
+
             disableDragDirection(DirectionFlag.UP)
             disableDragDirection(DirectionFlag.DOWN)
             disableDragDirection(DirectionFlag.LEFT)