diff --git a/tests/ui/test_ui_tools.py b/tests/ui/test_ui_tools.py
index 6f7dc62633..283b2cf501 100644
--- a/tests/ui/test_ui_tools.py
+++ b/tests/ui/test_ui_tools.py
@@ -1716,7 +1716,8 @@ def test_main_view_generates_stream_header(self, mocker, message,
         assert isinstance(view_components[0], Columns)
 
         assert isinstance(view_components[0][0], Text)
-        assert isinstance(view_components[0][1], Divider)
+        assert isinstance(view_components[0][1], Text)
+        assert isinstance(view_components[0][2], Divider)
 
     @pytest.mark.parametrize('message', [
         {
diff --git a/zulipterminal/ui_tools/boxes.py b/zulipterminal/ui_tools/boxes.py
index 74736e1abd..c8c537de18 100644
--- a/zulipterminal/ui_tools/boxes.py
+++ b/zulipterminal/ui_tools/boxes.py
@@ -287,11 +287,12 @@ def stream_header(self) -> Any:
         stream_title_markup = ('bar', [
             (bar_color, '{} {} '.format(self.stream_name,
                                         stream_topic_separator)),
-            ('title', ' {} '.format(self.topic_name))
+            ('title', ' {}'.format(self.topic_name))
         ])
         stream_title = urwid.Text(stream_title_markup)
         header = urwid.Columns([
             ('pack', stream_title),
+            (1, urwid.Text((color, ' '))),
             urwid.AttrWrap(urwid.Divider('━'), color),
         ])
         header.markup = stream_title_markup
@@ -305,7 +306,7 @@ def private_header(self) -> Any:
         title = urwid.Text(title_markup)
         header = urwid.Columns([
             ('pack', title),
-            (1, urwid.Text(' ')),
+            (1, urwid.Text(('general_bar', ' '))),
             urwid.AttrWrap(urwid.Divider('━'), 'general_bar'),
         ])
         header.markup = title_markup