diff --git a/lib/features/composer/presentation/extensions/handle_keyboard_shortcut_actions_extension.dart b/lib/features/composer/presentation/extensions/handle_keyboard_shortcut_actions_extension.dart
index f6db97185..450ed3fd8 100644
--- a/lib/features/composer/presentation/extensions/handle_keyboard_shortcut_actions_extension.dart
+++ b/lib/features/composer/presentation/extensions/handle_keyboard_shortcut_actions_extension.dart
@@ -43,7 +43,11 @@ extension HandleKeyboardShortcutActionsExtension on ComposerController {
 
   void handleComposerShortcutAction(ComposerActionShortcutType shortcutType) {
     log('$runtimeType::handleComposerShortcutAction: 🔥 Shortcut triggered: $shortcutType');
-    if (currentContext == null) return;
-    handleClickCloseComposer(currentContext!);
+    switch(shortcutType) {
+      case ComposerActionShortcutType.closeView:
+        if (currentContext == null) return;
+        handleClickCloseComposer(currentContext!);
+        break;
+    }
   }
 }
\ No newline at end of file