diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1fb9fcd6..fd256cc8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,7 +3,7 @@
 ## Unversioned
 
 - Minor: Nicknames are now taken into consideration when searching for messages. (#4663)
-- Minor: Add an icon showing when streamer mode is enabled (#4410)
+- Minor: Add an icon showing when streamer mode is enabled (#4410, #4690)
 - Minor: Added `/shoutout <username>` commands to shoutout specified user. (#4638)
 - Minor: Improved editing hotkeys. (#4628)
 - Minor: The input completion and quick switcher are now styled to match your theme. (#4671)
diff --git a/src/widgets/Window.cpp b/src/widgets/Window.cpp
index d3687281..504ee746 100644
--- a/src/widgets/Window.cpp
+++ b/src/widgets/Window.cpp
@@ -197,6 +197,9 @@ void Window::addCustomTitlebarButtons()
     this->signalHolder_.managedConnect(getApp()->streamerModeChanged, [this]() {
         this->updateStreamerModeIcon();
     });
+
+    // Update initial state
+    this->updateStreamerModeIcon();
 }
 
 void Window::updateStreamerModeIcon()