diff --git a/lib/route.dart b/lib/route.dart
index 4f86fe73..a92ca726 100644
--- a/lib/route.dart
+++ b/lib/route.dart
@@ -105,17 +105,6 @@ final routerProvider = Provider<GoRouter>((ref) {
         },
         routes: [
           // Standalone routes without bottom navigation
-          GoRoute(
-            name: 'postCompose',
-            path: '/posts/compose',
-            builder:
-                (context, state) => PostComposeScreen(
-                  initialState: state.extra as PostComposeInitialState?,
-                  type:
-                      int.tryParse(state.uri.queryParameters['type'] ?? '0') ??
-                      0,
-                ),
-          ),
           GoRoute(
             name: 'postEdit',
             path: '/posts/:id/edit',
diff --git a/lib/screens/posts/post_detail.dart b/lib/screens/posts/post_detail.dart
index 4e7870e3..2a31e01c 100644
--- a/lib/screens/posts/post_detail.dart
+++ b/lib/screens/posts/post_detail.dart
@@ -18,6 +18,7 @@ import 'package:island/widgets/post/post_award_history_sheet.dart';
 import 'package:island/widgets/post/post_pin_sheet.dart';
 import 'package:island/widgets/post/post_quick_reply.dart';
 import 'package:island/widgets/post/post_replies.dart';
+import 'package:island/widgets/post/compose_sheet.dart';
 import 'package:island/widgets/response.dart';
 import 'package:island/utils/share_utils.dart';
 import 'package:island/widgets/safety/abuse_report_helper.dart';
@@ -229,9 +230,9 @@ class PostActionButtons extends HookConsumerWidget {
     final replyButtons = <Widget>[
       FilledButton.tonal(
         onPressed: () {
-          context.pushNamed(
-            'postCompose',
-            extra: PostComposeInitialState(replyingTo: post),
+          PostComposeSheet.show(
+            context,
+            initialState: PostComposeInitialState(replyingTo: post),
           );
         },
         style: FilledButton.styleFrom(
@@ -255,9 +256,9 @@ class PostActionButtons extends HookConsumerWidget {
         message: 'forward'.tr(),
         child: FilledButton.tonal(
           onPressed: () {
-            context.pushNamed(
-              'postCompose',
-              extra: PostComposeInitialState(forwardingTo: post),
+            PostComposeSheet.show(
+              context,
+              initialState: PostComposeInitialState(forwardingTo: post),
             );
           },
           style: FilledButton.styleFrom(
diff --git a/lib/widgets/share/share_sheet.dart b/lib/widgets/share/share_sheet.dart
index a48a93b7..01ef692b 100644
--- a/lib/widgets/share/share_sheet.dart
+++ b/lib/widgets/share/share_sheet.dart
@@ -10,6 +10,7 @@ import 'package:island/widgets/content/sheet.dart';
 import 'package:material_symbols_icons/symbols.dart';
 import 'package:island/screens/posts/compose.dart';
 import 'package:island/models/file.dart';
+import 'package:island/widgets/post/compose_sheet.dart';
 import 'package:island/pods/link_preview.dart';
 import 'package:island/pods/network.dart';
 import 'package:mime/mime.dart';
@@ -174,9 +175,9 @@ class _ShareSheetState extends ConsumerState<ShareSheet> {
         attachments: attachments,
       );
 
-      // Navigate to compose screen
+      // Show compose sheet
       if (mounted) {
-        context.pushNamed('postCompose', extra: initialState);
+        PostComposeSheet.show(context, initialState: initialState);
         Navigator.of(context).pop(); // Close the share sheet
       }
     } catch (e) {