diff --git a/Packages/ComposeUI/Sources/ComposeUI/Views/Attachments/AttachmentsSection.swift b/Packages/ComposeUI/Sources/ComposeUI/Views/Attachments/AttachmentsSection.swift
index b991647e0..83485a35c 100644
--- a/Packages/ComposeUI/Sources/ComposeUI/Views/Attachments/AttachmentsSection.swift
+++ b/Packages/ComposeUI/Sources/ComposeUI/Views/Attachments/AttachmentsSection.swift
@@ -210,11 +210,15 @@ private class WrappedCollectionViewController: UIViewController {
             return section
         }
         let attachmentCell = UICollectionView.CellRegistration<HostingCollectionViewCell, DraftAttachment> { [unowned self] cell, indexPath, attachment in
+            #if !os(visionOS)
             cell.containingViewController = self
+            #endif
             cell.setView(AttachmentCollectionViewCellView(attachment: attachment))
         }
         let addButtonCell = UICollectionView.CellRegistration<HostingCollectionViewCell, Void> { [unowned self] cell, indexPath, item in
+            #if !os(visionOS)
             cell.containingViewController = self
+            #endif
             cell.setView(AddAttachmentButton(viewController: self))
         }
         let collectionView = IntrinsicContentSizeCollectionView(frame: .zero, collectionViewLayout: layout)
diff --git a/Packages/ComposeUI/Sources/ComposeUI/Views/ComposeNavigationBarActions.swift b/Packages/ComposeUI/Sources/ComposeUI/Views/ComposeNavigationBarActions.swift
index 591b1757b..70d81d786 100644
--- a/Packages/ComposeUI/Sources/ComposeUI/Views/ComposeNavigationBarActions.swift
+++ b/Packages/ComposeUI/Sources/ComposeUI/Views/ComposeNavigationBarActions.swift
@@ -27,7 +27,7 @@ struct ComposeNavigationBarActions: ToolbarContent {
             DraftsButton(isShowingDrafts: $isShowingDrafts)
         }
         ToolbarItem(placement: .confirmationAction) {
-            PostButton(draft: draft, isPosting: isPosting)
+            PostButton(draft: draft, isPosting: isPosting, postStatus: postStatus)
         }
         #else
         ToolbarItem(placement: .confirmationAction) {
diff --git a/Packages/ComposeUI/Sources/ComposeUI/Views/ComposeView.swift b/Packages/ComposeUI/Sources/ComposeUI/Views/ComposeView.swift
index e4213931c..56d01acce 100644
--- a/Packages/ComposeUI/Sources/ComposeUI/Views/ComposeView.swift
+++ b/Packages/ComposeUI/Sources/ComposeUI/Views/ComposeView.swift
@@ -137,7 +137,9 @@ private struct ComposeViewBody: View {
             ScrollView {
                 scrollContent
             }
+            #if !os(visionOS)
             .scrollDismissesKeyboardInteractivelyIfAvailable()
+            #endif
             #if !os(visionOS) && !targetEnvironment(macCatalyst)
             .modifier(ToolbarSafeAreaInsetModifier())
             #endif