diff --git a/ios/Packages/Sybil/Sources/Sybil/SybilWorkspaceView.swift b/ios/Packages/Sybil/Sources/Sybil/SybilWorkspaceView.swift
index 6d27778..6311e04 100644
--- a/ios/Packages/Sybil/Sources/Sybil/SybilWorkspaceView.swift
+++ b/ios/Packages/Sybil/Sources/Sybil/SybilWorkspaceView.swift
@@ -397,9 +397,7 @@ struct SybilWorkspaceView: View {
                 .lineLimit(1 ... 6)
                 .submitLabel(.send)
                 .onSubmit {
-                    Task {
-                        await viewModel.sendComposer()
-                    }
+                    submitComposer()
                 }
                 .padding(.horizontal, 12)
                 .padding(.vertical, 10)
@@ -414,9 +412,7 @@ struct SybilWorkspaceView: View {
                 .foregroundStyle(SybilTheme.text)
 
                 Button {
-                    Task {
-                        await viewModel.sendComposer()
-                    }
+                    submitComposer()
                 } label: {
                     Image(systemName: viewModel.isSearchMode ? "magnifyingglass" : "arrow.up")
                         .font(.system(size: 17, weight: .semibold))
@@ -527,6 +523,22 @@ struct SybilWorkspaceView: View {
         }
     }
 
+    private func submitComposer() {
+        guard viewModel.canSendComposer else {
+            return
+        }
+
+        #if !targetEnvironment(macCatalyst)
+        if !viewModel.isSearchMode {
+            composerFocused = false
+        }
+        #endif
+
+        Task {
+            await viewModel.sendComposer()
+        }
+    }
+
     @MainActor
     private func importAttachmentsFromItemProviders(_ providers: [NSItemProvider]) async {
         do {