diff --git a/tests/ui/test_ui_tools.py b/tests/ui/test_ui_tools.py
index b2a14abf80..5bd2f2ceaf 100644
--- a/tests/ui/test_ui_tools.py
+++ b/tests/ui/test_ui_tools.py
@@ -1858,7 +1858,7 @@ def test_main_view_generates_EDITED_label(self, mocker,
     @pytest.mark.parametrize('key', keys_for_command('STREAM_MESSAGE'))
     @pytest.mark.parametrize('narrow, expect_to_prefill', [
         ([], False),
-        ([['stream', 'general']], False),
+        ([['stream', 'general']], True),
         ([['stream', 'general'], ['topic', 'Test']], True),
         ([['is', 'starred']], False),
         ([['is', 'mentioned']], False),
diff --git a/zulipterminal/ui_tools/boxes.py b/zulipterminal/ui_tools/boxes.py
index 335f965676..ee38d6007a 100644
--- a/zulipterminal/ui_tools/boxes.py
+++ b/zulipterminal/ui_tools/boxes.py
@@ -1388,7 +1388,10 @@ def keypress(self, size: urwid_Size, key: str) -> Optional[str]:
                     stream_id=self.stream_id,
                 )
         elif is_command_key('STREAM_MESSAGE', key):
-            if len(self.model.narrow) == 2:
+            if (
+                len(self.model.narrow) != 0
+                and self.model.narrow[0][0] == "stream"
+               ):
                 self.model.controller.view.write_box.stream_box_view(
                     caption=self.message['display_recipient'],
                     stream_id=self.stream_id,