diff --git a/src/components/common/UpdateIndicator.tsx b/src/components/common/UpdateIndicator.tsx
index 7cc752f1127da256671e1548b44876b5d90e6fcf..9e015ce2d78456a7a9d41f6ccb451f28eb0f234f 100644
--- a/src/components/common/UpdateIndicator.tsx
+++ b/src/components/common/UpdateIndicator.tsx
@@ -10,6 +10,7 @@ import { ThemeContext } from "../../context/Theme";
 import IconButton from "../ui/IconButton";
 
 import { updateSW } from "../../main";
+import Tooltip from "./Tooltip";
 
 let pendingUpdate = false;
 internalSubscribe("PWA", "update", () => (pendingUpdate = true));
@@ -30,8 +31,14 @@ export default function UpdateIndicator({ style }: Props) {
 
     if (style === "titlebar") {
         return (
-            <div onClick={() => updateSW(true)}>
-                <CloudDownload size={22} color={theme.success} />
+            <div class="actions">
+                <Tooltip
+                    content="A new update is available!"
+                    placement="bottom">
+                    <div onClick={() => updateSW(true)}>
+                        <CloudDownload size={22} color={theme.success} />
+                    </div>
+                </Tooltip>
             </div>
         );
     }
diff --git a/src/components/native/Titlebar.tsx b/src/components/native/Titlebar.tsx
index 6e17ee429e8b33fc0b672243870a9939d85dfb9d..3a8b680e2956d4246cb6bac938168f6dc1612518 100644
--- a/src/components/native/Titlebar.tsx
+++ b/src/components/native/Titlebar.tsx
@@ -75,13 +75,7 @@ export function Titlebar() {
                 </svg>
                 {window.native.getConfig().build === "dev" && <Wrench />}
             </div>
-            <div class="actions">
-                <Tooltip
-                    content="A new update is available!"
-                    placement="bottom">
-                    <UpdateIndicator style="titlebar" />
-                </Tooltip>
-            </div>
+            <UpdateIndicator style="titlebar" />
             <div class="actions">
                 <div onClick={window.native.min}>
                     <Minus size={20} />