diff --git a/ElementX/Sources/Application/Settings/AppSettings.swift b/ElementX/Sources/Application/Settings/AppSettings.swift
index e2290d800..4568f5c99 100644
--- a/ElementX/Sources/Application/Settings/AppSettings.swift
+++ b/ElementX/Sources/Application/Settings/AppSettings.swift
@@ -412,7 +412,7 @@ final nonisolated class AppSettings: @unchecked Sendable {
     @UserPreference(defaultValue: false)
     var messageMultiSelectEnabled: Bool
     
-    @UserPreference(defaultValue: ProcessInfo().isiOSAppOnMac)
+    @UserPreference(key: "globalSearchEnabledV2", defaultValue: true)
     var globalSearchEnabled: Bool
     
     @UserPreference(defaultValue: false)
diff --git a/ElementX/Sources/Mocks/ClientProxyMock.swift b/ElementX/Sources/Mocks/ClientProxyMock.swift
index b0962a392..dd5e20f0b 100644
--- a/ElementX/Sources/Mocks/ClientProxyMock.swift
+++ b/ElementX/Sources/Mocks/ClientProxyMock.swift
@@ -64,6 +64,11 @@ extension ClientProxyMock {
         alternateRoomSummaryProvider = RoomSummaryProviderMock(.init())
         staticRoomSummaryProvider = RoomSummaryProviderMock(.init())
         
+        let searchService = SearchServiceProxyMock()
+        searchService.resultsPublisher = .init([])
+        searchService.paginationStatePublisher = .init(.idle(endReached: true))
+        self.searchService = searchService
+        
         roomDirectorySearchProxyReturnValue = configuration.roomDirectorySearchProxy
         
         actionsPublisher = PassthroughSubject<ClientProxyAction, Never>().eraseToAnyPublisher()
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/homeScreen.Empty-iPad-en-GB.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/homeScreen.Empty-iPad-en-GB.png
index f467fd975..7989b9ec0 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/homeScreen.Empty-iPad-en-GB.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/homeScreen.Empty-iPad-en-GB.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:77c05cf86bd7e3db4fc270b37aa76bd30a89f5421d8e160ee245195130d9d77b
-size 130624
+oid sha256:4bc19ec3a4fe30560c920021ad03e6ad9028c1a296f46c1dcdaa18a0abdfdc43
+size 154137
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/homeScreen.Empty-iPad-pseudo.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/homeScreen.Empty-iPad-pseudo.png
index caf951efa..52741c0af 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/homeScreen.Empty-iPad-pseudo.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/homeScreen.Empty-iPad-pseudo.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:263e91a17fb48924e066c31f94ff52fa911f8b343d98a8a471846c424156c6e6
-size 135609
+oid sha256:2a3f208b7434fd0861aec415c5567dced61b012a798f88da155541bed098b989
+size 160025
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/homeScreen.Empty-iPhone-en-GB.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/homeScreen.Empty-iPhone-en-GB.png
index 88728bccd..21f50060c 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/homeScreen.Empty-iPhone-en-GB.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/homeScreen.Empty-iPhone-en-GB.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:98137d5732c0012114dce74fb55b51c7639310f85343762d75e7a6fa1bdb2062
-size 68878
+oid sha256:31e4cb7d69e60c6e6a2e2cd86c750e262b41d05ff4b20e31332bffce527fbcf1
+size 76858
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/homeScreen.Empty-iPhone-pseudo.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/homeScreen.Empty-iPhone-pseudo.png
index 4386b69aa..2df0a1804 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/homeScreen.Empty-iPhone-pseudo.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/homeScreen.Empty-iPhone-pseudo.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d4721ff64563f38fa1a3fa77c27abe1b18877a70db85f72d6a3dcbaed29fe875
-size 79936
+oid sha256:6a13ee7cec33a141bc15b2021f991e0c85f5ef2c45e0b439aa7b4d46f8af6e42
+size 88807
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/homeScreen.Loaded-iPad-en-GB.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/homeScreen.Loaded-iPad-en-GB.png
index 59d918ea9..8923ca550 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/homeScreen.Loaded-iPad-en-GB.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/homeScreen.Loaded-iPad-en-GB.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9d2db65b64dc39f57dc60caa34393372cc6dafa122b8e983a7d021c5c952fbc7
-size 318659
+oid sha256:c390fea6d1a3f5c6be3623722b744755e694e95cb4b8c445d5d13fc6b746d595
+size 319494
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/homeScreen.Loaded-iPad-pseudo.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/homeScreen.Loaded-iPad-pseudo.png
index 5357f3cb9..bbf401d9a 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/homeScreen.Loaded-iPad-pseudo.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/homeScreen.Loaded-iPad-pseudo.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4796e7c0cfbd1985f46c799d952f87d35dee46006c11c1b648812eac2be911e9
-size 333865
+oid sha256:6c8e61eb5a6abd03d7e19ab22cdddace988a28c4254a6261edab4a3593092cac
+size 334976
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/homeScreen.Loaded-iPhone-en-GB.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/homeScreen.Loaded-iPhone-en-GB.png
index 81ae9f54f..4cf2c97dc 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/homeScreen.Loaded-iPhone-en-GB.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/homeScreen.Loaded-iPhone-en-GB.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e9c2a61b6e3753294087a8756ce681fee34815a9ebbc8efd33d633012720edb6
-size 217408
+oid sha256:fe91a5bce5152e3e34042b359f8af09467cded0dbf084cdb7b1f3aac16e2e38a
+size 219427
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/homeScreen.Loaded-iPhone-pseudo.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/homeScreen.Loaded-iPhone-pseudo.png
index 5d861b584..539f3e480 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/homeScreen.Loaded-iPhone-pseudo.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/homeScreen.Loaded-iPhone-pseudo.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b5919d23214505cdaf84c7d024d95289366eab433240050cd13fd6d8e052466d
-size 225976
+oid sha256:0c2ca47de1d4a52e496a655ef07f4058b3f3aa0fb89fadf9ec4eb4b4e67ae123
+size 227639
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/homeScreen.Loading-iPad-en-GB.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/homeScreen.Loading-iPad-en-GB.png
index 04a28cb1a..3ef01084b 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/homeScreen.Loading-iPad-en-GB.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/homeScreen.Loading-iPad-en-GB.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c00e984f4ebe8d27128167c2ce2ca7890f8ab43974539797dbed9735e7bdd9b8
-size 130640
+oid sha256:46c8f6da8e151fbe6c36c2bf1e35fcceb9e9e08b225aae978a302ec86f4a04f4
+size 154453
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/homeScreen.Loading-iPad-pseudo.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/homeScreen.Loading-iPad-pseudo.png
index c848cc7f3..e22ee1b4c 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/homeScreen.Loading-iPad-pseudo.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/homeScreen.Loading-iPad-pseudo.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b601fdb7f4ec34607fa80f7d9a79f7d1e94dab250277d40e951a4c2595263702
-size 132187
+oid sha256:47d6114b2255c1fead07c5150a97c59d5f5e3b30f0fbb6a84b3dc11a0231503f
+size 156825
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/homeScreen.Loading-iPhone-en-GB.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/homeScreen.Loading-iPhone-en-GB.png
index ba38b43d3..84e16d237 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/homeScreen.Loading-iPhone-en-GB.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/homeScreen.Loading-iPhone-en-GB.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:06a48805516728e1af9b96800f6a1998ebce22b99066db629f3019a2a74d0fa8
-size 67175
+oid sha256:ea82925485affb93970641dbf26f944e7fad4a72d5df025b719e8b3b12340a06
+size 76577
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/homeScreen.Loading-iPhone-pseudo.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/homeScreen.Loading-iPhone-pseudo.png
index 00f8f078a..8932fd979 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/homeScreen.Loading-iPhone-pseudo.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/homeScreen.Loading-iPhone-pseudo.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:72bb7e44c29de10f8b7e4d5188ea98b5aed3f439e4a8f02acd854759b010e22e
-size 68926
+oid sha256:052c1cfa075d21b993ed25eddca425522849d11eb60955858a940d9ca65c880b
+size 79108