diff --git a/CHANGELOG.md b/CHANGELOG.md
index e05d3451b..199bcb269 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -123,6 +123,7 @@
 - Bugfix: Fixed invalid/dangling completion when cycling through previous messages or replying (#4072)
 - Bugfix: Fixed incorrect .desktop icon path. (#4078)
 - Bugfix: Mark bad or invalid images as empty. (#4151)
+- Bugfix: Fixed `/watching` channel jumping around. (#4169)
 - Dev: Got rid of BaseTheme (#4132)
 - Dev: Removed official support for QMake. (#3839, #3883)
 - Dev: Rewrote LimitedQueue (#3798)
diff --git a/src/singletons/NativeMessaging.cpp b/src/singletons/NativeMessaging.cpp
index 2f50c8272..e9b864caa 100644
--- a/src/singletons/NativeMessaging.cpp
+++ b/src/singletons/NativeMessaging.cpp
@@ -239,8 +239,11 @@ void NativeMessagingServer::ReceiverThread::handleMessage(
             postToThread([=] {
                 if (!name.isEmpty())
                 {
-                    app->twitch->watchingChannel.reset(
-                        app->twitch->getOrAddChannel(name));
+                    auto channel = app->twitch->getOrAddChannel(name);
+                    if (app->twitch->watchingChannel.get() != channel)
+                    {
+                        app->twitch->watchingChannel.reset(channel);
+                    }
                 }
 
                 if (attach || attachFullscreen)