diff --git a/lib/screens/compose/community_picker_screen.dart b/lib/screens/compose/community_picker_screen.dart
index 26d02f6..4db2548 100644
--- a/lib/screens/compose/community_picker_screen.dart
+++ b/lib/screens/compose/community_picker_screen.dart
@@ -217,6 +217,7 @@ class _CommunityPickerScreenState extends State<CommunityPickerScreen> {
         elevation: 0,
         leading: IconButton(
           icon: const Icon(Icons.close),
+          tooltip: 'Close',
           onPressed: () => Navigator.pop(context),
         ),
       ),
diff --git a/lib/screens/home/create_post_screen.dart b/lib/screens/home/create_post_screen.dart
index f1af130..1c684e5 100644
--- a/lib/screens/home/create_post_screen.dart
+++ b/lib/screens/home/create_post_screen.dart
@@ -383,6 +383,7 @@ class _CreatePostScreenState extends State<CreatePostScreen>
         automaticallyImplyLeading: false,
         leading: IconButton(
           icon: const Icon(Icons.close),
+          tooltip: 'Close',
           onPressed: () {
             // Use callback if available (tab navigation), otherwise pop
             if (widget.onNavigateToFeed != null) {