diff --git a/Mail/Views/ThreadListManagerView.swift b/Mail/Views/ThreadListManagerView.swift
index 0562a57a4..e7ad85358 100644
--- a/Mail/Views/ThreadListManagerView.swift
+++ b/Mail/Views/ThreadListManagerView.swift
@@ -41,15 +41,16 @@ struct ThreadListManagerView: View {
         ZStack {
             if mainViewState.isShowingSearch {
                 SearchView(mailboxManager: mailboxManager, folder: mainViewState.selectedFolder)
+                    .id(threadListViewHash)
             } else {
                 ThreadListView(
                     mailboxManager: mailboxManager,
                     folder: mainViewState.selectedFolder,
                     isCompact: isCompactWindow
                 )
+                .id(threadListViewHash)
             }
         }
-        .id(threadListViewHash)
         .animation(.easeInOut(duration: 0.25), value: mainViewState.isShowingSearch)
     }
 }