diff --git a/ElementX/Sources/Other/SwiftUI/PreviewScrollView.swift b/ElementX/Sources/Other/SwiftUI/PreviewScrollView.swift
index 513da6876..d6324c968 100644
--- a/ElementX/Sources/Other/SwiftUI/PreviewScrollView.swift
+++ b/ElementX/Sources/Other/SwiftUI/PreviewScrollView.swift
@@ -14,7 +14,6 @@ struct PreviewScrollView<Content: View>: View {
     var content: () -> Content
     
     var body: some View {
-        #if DEBUG
         if ProcessInfo.isRunningTests {
             content()
         } else {
@@ -22,10 +21,5 @@ struct PreviewScrollView<Content: View>: View {
                 content()
             }
         }
-        #else
-        ScrollView {
-            content()
-        }
-        #endif
     }
 }
diff --git a/ElementX/Sources/Screens/MediaEventsTimelineScreen/View/MediaEventsTimelineScreen.swift b/ElementX/Sources/Screens/MediaEventsTimelineScreen/View/MediaEventsTimelineScreen.swift
index 17440087e..a390d5757 100644
--- a/ElementX/Sources/Screens/MediaEventsTimelineScreen/View/MediaEventsTimelineScreen.swift
+++ b/ElementX/Sources/Screens/MediaEventsTimelineScreen/View/MediaEventsTimelineScreen.swift
@@ -54,7 +54,7 @@ struct MediaEventsTimelineScreen: View {
     }
     
     private var scrollView: some View {
-        PreviewScrollView {
+        ScrollView {
             Group {
                 switch context.viewState.screenMode {
                 case .media:
@@ -269,13 +269,15 @@ struct MediaEventsTimelineScreen_Previews: PreviewProvider, TestablePreview {
     static let emptyFilesViewModel = makeViewModel(empty: true, screenMode: .files)
     
     static var previews: some View {
-        MediaEventsTimelineScreen(context: mediaViewModel.context)
-            .previewLayout(.sizeThatFits)
-            .previewDisplayName("Media")
+        ElementNavigationStack {
+            MediaEventsTimelineScreen(context: mediaViewModel.context)
+        }
+        .previewDisplayName("Media")
         
-        MediaEventsTimelineScreen(context: filesViewModel.context)
-            .previewLayout(.sizeThatFits)
-            .previewDisplayName("Files")
+        ElementNavigationStack {
+            MediaEventsTimelineScreen(context: filesViewModel.context)
+        }
+        .previewDisplayName("Files")
         
         ElementNavigationStack {
             MediaEventsTimelineScreen(context: emptyMediaViewModel.context)
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/mediaEventsTimelineScreen.Files-iPad-en-GB.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/mediaEventsTimelineScreen.Files-iPad-en-GB.png
index 09fedb39c..b15c090bf 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/mediaEventsTimelineScreen.Files-iPad-en-GB.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/mediaEventsTimelineScreen.Files-iPad-en-GB.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d62bf9e1483d223d9e075fdd390fc7037d9d113d85eb50c2f63f5b6316df2f57
-size 825076
+oid sha256:1ec3f3c099e9ad530b71aeba2715f76f45ff1b4ed7c2459df3da5c49f2e09400
+size 159454
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/mediaEventsTimelineScreen.Files-iPad-pseudo.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/mediaEventsTimelineScreen.Files-iPad-pseudo.png
index 42a225812..0686f3552 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/mediaEventsTimelineScreen.Files-iPad-pseudo.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/mediaEventsTimelineScreen.Files-iPad-pseudo.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:12ffa1476d37af6e4dcc16228a781601bf00dec675dd7abce84178f3d7f79d4f
-size 837649
+oid sha256:eee23832fec2633137eb1c9d581f7c14ae5f8c1a179d8f265bfa68793ee219b3
+size 167421
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/mediaEventsTimelineScreen.Files-iPhone-en-GB.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/mediaEventsTimelineScreen.Files-iPhone-en-GB.png
index 79d7c5a50..46223760a 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/mediaEventsTimelineScreen.Files-iPhone-en-GB.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/mediaEventsTimelineScreen.Files-iPhone-en-GB.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:80caad7a2c5b60c6b361bd2fb45465a29cd762c1c2179c0f90e76edf65e31bdb
-size 513997
+oid sha256:522ceeb4fd72b4dcee8889505a83e193c6c5cd0e334ed1a11062c323d6a0bd66
+size 101582
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/mediaEventsTimelineScreen.Files-iPhone-pseudo.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/mediaEventsTimelineScreen.Files-iPhone-pseudo.png
index 748d81641..5630000d9 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/mediaEventsTimelineScreen.Files-iPhone-pseudo.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/mediaEventsTimelineScreen.Files-iPhone-pseudo.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:110401e93bf1098bbed54d2e89ac408580f133a07de50660d9a4668c7a8ac14d
-size 542109
+oid sha256:491099140a46ab7c3a3fbd9623226202c6accdc1952a4b690941b7d06f20ba91
+size 109177
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/mediaEventsTimelineScreen.Media-iPad-en-GB.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/mediaEventsTimelineScreen.Media-iPad-en-GB.png
index de4418942..ce1bac3cb 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/mediaEventsTimelineScreen.Media-iPad-en-GB.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/mediaEventsTimelineScreen.Media-iPad-en-GB.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6cfc5d795664ded8de58676cb2e2845f131dcd67bd05e677de46228e3ce7a7f7
-size 1094643
+oid sha256:46ad69d119cecd7c343cd6b108a9c7839d1aa7ec743d4e1122d51e2fb2cf8e35
+size 1089783
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/mediaEventsTimelineScreen.Media-iPad-pseudo.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/mediaEventsTimelineScreen.Media-iPad-pseudo.png
index f98484ff2..a9b9aa30c 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/mediaEventsTimelineScreen.Media-iPad-pseudo.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/mediaEventsTimelineScreen.Media-iPad-pseudo.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5bbbb6bd3cb71bcfd310e9b6bfcbeda4b920ec9a187ffe4d9c3d9a9d38afe2ca
-size 1099685
+oid sha256:f7310ef85ba8ddc2ff56541ff60dca46fd765f996b11bd55206202f4043ea124
+size 1095236
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/mediaEventsTimelineScreen.Media-iPhone-en-GB.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/mediaEventsTimelineScreen.Media-iPhone-en-GB.png
index 09081e322..c4307e803 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/mediaEventsTimelineScreen.Media-iPhone-en-GB.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/mediaEventsTimelineScreen.Media-iPhone-en-GB.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1499339d845b9f84d18cebd93c2aeebef39874f1f64f9a4509e9858018300a9a
-size 2416031
+oid sha256:9b4a12cc3b586ca0812f786a851243d4ac975f939f0109a29a49cfc99805d6b1
+size 1293697
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/mediaEventsTimelineScreen.Media-iPhone-pseudo.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/mediaEventsTimelineScreen.Media-iPhone-pseudo.png
index 67726cf25..fbdf63524 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/mediaEventsTimelineScreen.Media-iPhone-pseudo.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/mediaEventsTimelineScreen.Media-iPhone-pseudo.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:59b9179e0d77709bee8205353c27ea0c087b045828a5b677f6381a7b37254263
-size 2421650
+oid sha256:56b812e3d7c7af233cdcf9a4b0cd9de29cc826d94ed416b678f39a4038431f97
+size 1295622