diff --git a/Packages/StatusKit/Sources/StatusKit/Row/StatusRowView.swift b/Packages/StatusKit/Sources/StatusKit/Row/StatusRowView.swift
index 5d3b1f5b..791b541e 100644
--- a/Packages/StatusKit/Sources/StatusKit/Row/StatusRowView.swift
+++ b/Packages/StatusKit/Sources/StatusKit/Row/StatusRowView.swift
@@ -83,33 +83,33 @@ public struct StatusRowView: View {
                   viewModel.navigateToAccountDetail(account: viewModel.finalStatus.account)
                 }
             }
-            if !isCompact {
-              StatusRowHeaderView(viewModel: viewModel)
-            }
-          }
-          VStack(alignment: .leading, spacing: .statusComponentSpacing) {
-            StatusRowContentView(viewModel: viewModel)
-              .contentShape(Rectangle())
-              .onTapGesture {
-                guard !isFocused else { return }
-                viewModel.navigateToDetail()
+            VStack(alignment: .leading, spacing: .statusComponentSpacing) {
+              if !isCompact {
+                StatusRowHeaderView(viewModel: viewModel)
               }
-              .accessibilityActions {
-                if isFocused, viewModel.showActions {
-                  accessibilityActions
+              StatusRowContentView(viewModel: viewModel)
+                .contentShape(Rectangle())
+                .onTapGesture {
+                  guard !isFocused else { return }
+                  viewModel.navigateToDetail()
                 }
+                .accessibilityActions {
+                  if isFocused, viewModel.showActions {
+                    accessibilityActions
+                  }
+                }
+              if !reasons.contains(.placeholder),
+                 viewModel.showActions, isFocused || theme.statusActionsDisplay != .none,
+                 !isInCaptureMode
+              {
+                StatusRowActionsView(isBlockConfirmationPresented: $isBlockConfirmationPresented,
+                                     viewModel: viewModel)
+                  .tint(isFocused ? theme.tintColor : .gray)
               }
-            if !reasons.contains(.placeholder),
-               viewModel.showActions, isFocused || theme.statusActionsDisplay != .none,
-               !isInCaptureMode
-            {
-              StatusRowActionsView(isBlockConfirmationPresented: $isBlockConfirmationPresented,
-                                   viewModel: viewModel)
-                .tint(isFocused ? theme.tintColor : .gray)
-            }
 
-            if isFocused, !isCompact {
-              StatusRowDetailView(viewModel: viewModel)
+              if isFocused, !isCompact {
+                StatusRowDetailView(viewModel: viewModel)
+              }
             }
           }
         }
diff --git a/Packages/StatusKit/Sources/StatusKit/Row/Subviews/StatusRowMediaPreviewView.swift b/Packages/StatusKit/Sources/StatusKit/Row/Subviews/StatusRowMediaPreviewView.swift
index dafdbdf4..6e2b16ef 100644
--- a/Packages/StatusKit/Sources/StatusKit/Row/Subviews/StatusRowMediaPreviewView.swift
+++ b/Packages/StatusKit/Sources/StatusKit/Row/Subviews/StatusRowMediaPreviewView.swift
@@ -54,7 +54,6 @@ public struct StatusRowMediaPreviewView: View {
             : CGSize(width: imageMaxHeight, height: imageMaxHeight),
           sensitive: sensitive
         )
-        .padding(.horizontal, .layoutPadding)
         .accessibilityElement(children: .ignore)
         .accessibilityLabel(Self.accessibilityLabel(for: attachments[0]))
         .accessibilityAddTraits([.isButton, .isImage])
@@ -67,11 +66,10 @@ public struct StatusRowMediaPreviewView: View {
             }
           }
           .padding(.bottom, scrollBottomPadding)
-          .padding(.horizontal, .layoutPadding)
         }
+        .scrollClipDisabled()
       }
     }
-    .padding(.horizontal, -1 * .layoutPadding)
   }
 
   @ViewBuilder