diff --git a/CHANGELOG.md b/CHANGELOG.md
index ffc9b9d6c..fbe9bad51 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -90,6 +90,7 @@
 - Bugfix: Fix quickswitcher not respecting order of tabs when filtering (#2519, #2561)
 - Bugfix: Fix GNOME not associating Chatterino's window with its desktop entry (#1863, #2587)
 - Bugfix: Fix buffer overflow in emoji parsing. (#2602)
+- Bugfix: Fix windows being brought back to life after the settings dialog was closed. (#1892, #2613)
 - Dev: Updated minimum required Qt framework version to 5.12. (#2210)
 - Dev: Migrated `Kraken::getUser` to Helix (#2260)
 - Dev: Migrated `TwitchAccount::(un)followUser` from Kraken to Helix and moved it to `Helix::(un)followUser`. (#2306)
diff --git a/src/widgets/BaseWindow.cpp b/src/widgets/BaseWindow.cpp
index 3466c08b0..649f2f6da 100644
--- a/src/widgets/BaseWindow.cpp
+++ b/src/widgets/BaseWindow.cpp
@@ -244,7 +244,10 @@ void BaseWindow::init()
         getSettings()->windowTopMost.connect(
             [this](bool topMost, auto) {
                 this->setWindowFlag(Qt::WindowStaysOnTopHint, topMost);
-                this->show();
+                if (this->isVisible())
+                {
+                    this->show();
+                }
             },
             this->managedConnections_);
     }