diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index a874a313d..94067efa4 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -254,6 +254,7 @@ nav1s <nav1s@proton.me>
 Ranjit Odedra <ranjitodedra.dev@gmail.com>
 Eltaurus <https://github.com/Eltaurus-Lt>
 jariji
+Junia Mannervik <junia.mannervik@gmail.com>
 Francisco Esteva <fr.esteva@duocuc.cl>
 SelfishPig <https://github.com/SelfishPig>
 
diff --git a/ftl/qt-repo b/ftl/qt-repo
index 0b7c53023..dad4e2736 160000
--- a/ftl/qt-repo
+++ b/ftl/qt-repo
@@ -1 +1 @@
-Subproject commit 0b7c530233390d73b706f012bbe7489539925c7d
+Subproject commit dad4e2736a2b53dcdb52d79b5703dd464c05d666
diff --git a/qt/aqt/utils.py b/qt/aqt/utils.py
index ae88dadcb..0899abfb8 100644
--- a/qt/aqt/utils.py
+++ b/qt/aqt/utils.py
@@ -1061,6 +1061,7 @@ def send_to_trash(path: Path) -> None:
 ######################################################################
 
 _tooltipTimer: QTimer | None = None
+_tooltipFocusTimer: QTimer | None = None
 _tooltipLabel: QLabel | None = None
 
 
@@ -1071,7 +1072,7 @@ def tooltip(
     x_offset: int = 0,
     y_offset: int = 100,
 ) -> None:
-    global _tooltipTimer, _tooltipLabel
+    global _tooltipTimer, _tooltipLabel, _tooltipFocusTimer
 
     class CustomLabel(QLabel):
         silentlyClose = True
@@ -1101,6 +1102,37 @@ def tooltip(
         lab.setPalette(p)
     lab.move(aw.mapToGlobal(QPoint(0 + x_offset, aw.height() - y_offset)))
     lab.show()
+    window = aw.window() if hasattr(aw, "window") else aw
+
+    was_active = window.isActiveWindow() if window else False
+
+    def close_if_parent_inactive() -> None:
+        if not _tooltipLabel or window is None:
+            return
+        # Check if window is still active and application has focus
+        app_has_focus = aqt.mw.app.focusWindow() is not None
+        window_is_active = window.isActiveWindow()
+        if (
+            not window.isVisible()
+            or (window.windowState() & Qt.WindowState.WindowMinimized)
+            or (was_active and (not window_is_active or not app_has_focus))
+        ):
+            closeTooltip()
+
+    if _tooltipFocusTimer:
+        try:
+            _tooltipFocusTimer.stop()
+            _tooltipFocusTimer.deleteLater()
+        except RuntimeError:
+            pass
+        _tooltipFocusTimer = None
+
+    if was_active:
+        focus_timer = QTimer(lab)
+        focus_timer.setInterval(100)
+        qconnect(focus_timer.timeout, close_if_parent_inactive)
+        focus_timer.start()
+        _tooltipFocusTimer = focus_timer
     _tooltipTimer = aqt.mw.progress.timer(
         period, closeTooltip, False, requiresCollection=False, parent=aw
     )
@@ -1108,7 +1140,7 @@ def tooltip(
 
 
 def closeTooltip() -> None:
-    global _tooltipLabel, _tooltipTimer
+    global _tooltipLabel, _tooltipTimer, _tooltipFocusTimer
     if _tooltipLabel:
         try:
             _tooltipLabel.deleteLater()
@@ -1122,6 +1154,13 @@ def closeTooltip() -> None:
         except RuntimeError:
             pass
         _tooltipTimer = None
+    if _tooltipFocusTimer:
+        try:
+            _tooltipFocusTimer.stop()
+            _tooltipFocusTimer.deleteLater()
+        except RuntimeError:
+            pass
+        _tooltipFocusTimer = None
 
 
 # true if invalid; print warning