diff --git a/CHANGELOG.md b/CHANGELOG.md
index a8536ea34e0..84db9de6d16 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -35,7 +35,7 @@
 - Bugfix: Fixed a crash when tab completing while having an invalid plugin loaded. (#5401)
 - Bugfix: Fixed windows on Windows not saving correctly when snapping them to the edges. (#5478)
 - Bugfix: Fixed user info card popups adding duplicate line to log files. (#5499)
-- Bugfix: Fixed tooltips and input completion popups not working after moving a split. (#5541)
+- Bugfix: Fixed tooltips and input completion popups not working after moving a split. (#5541, #5576)
 - Bugfix: Fixed rare issue on shutdown where the client would hang. (#5557)
 - Bugfix: Fixed `/clearmessages` not working with more than one window. (#5489)
 - Bugfix: Fixed splits staying paused after unfocusing Chatterino in certain configurations. (#5504)
diff --git a/src/widgets/BaseWindow.cpp b/src/widgets/BaseWindow.cpp
index 7d24a85d4dd..97dabb67247 100644
--- a/src/widgets/BaseWindow.cpp
+++ b/src/widgets/BaseWindow.cpp
@@ -505,7 +505,7 @@ bool BaseWindow::event(QEvent *event)
     }
 
 #if QT_VERSION >= QT_VERSION_CHECK(6, 7, 0)
-    if (this->flags_.has(DontFocus) || this->flags_.has(Dialog))
+    if (this->flags_.hasAny(DontFocus, Dialog, FramelessDraggable))
     {
         // This certain windows (e.g. TooltipWidget, input completion widget, and the search popup) retains their nullptr parent
         // NOTE that this currently does not retain their original transient parent (which is the window it was created under)