diff --git a/emain/emain-ipc.ts b/emain/emain-ipc.ts
index aaf3736431..72498f15c1 100644
--- a/emain/emain-ipc.ts
+++ b/emain/emain-ipc.ts
@@ -17,6 +17,7 @@ import {
     incrementTermCommandsRemote,
     incrementTermCommandsRun,
     incrementTermCommandsWsl,
+    setWasActive,
 } from "./emain-activity";
 import { createBuilderWindow, getAllBuilderWindows, getBuilderWindowByWebContentsId } from "./emain-builder";
 import { callWithOriginalXdgCurrentDesktopAsync, unamePlatform } from "./emain-platform";
@@ -317,6 +318,10 @@ export function initIpcHandlers() {
         tabView?.setKeyboardChordMode(true);
     });
 
+    electron.ipcMain.handle("set-is-active", () => {
+        setWasActive(true);
+    });
+
     const fac = new FastAverageColor();
     electron.ipcMain.on("update-window-controls-overlay", async (event, rect: Dimensions) => {
         if (unamePlatform === "darwin") return;
diff --git a/emain/preload.ts b/emain/preload.ts
index 7acdf2e73a..823f99c4cd 100644
--- a/emain/preload.ts
+++ b/emain/preload.ts
@@ -71,6 +71,7 @@ contextBridge.exposeInMainWorld("api", {
     setBuilderWindowAppId: (appId: string) => ipcRenderer.send("set-builder-window-appid", appId),
     doRefresh: () => ipcRenderer.send("do-refresh"),
     saveTextFile: (fileName: string, content: string) => ipcRenderer.invoke("save-text-file", fileName, content),
+    setIsActive: () => ipcRenderer.invoke("set-is-active"),
 });
 
 // Custom event for "new-window"
diff --git a/frontend/app/app.tsx b/frontend/app/app.tsx
index 76ad557516..0970b476a1 100644
--- a/frontend/app/app.tsx
+++ b/frontend/app/app.tsx
@@ -200,12 +200,16 @@ function AppFocusHandler() {
 const AppKeyHandlers = () => {
     useEffect(() => {
         const staticKeyDownHandler = keyutil.keydownWrapper(appHandleKeyDown);
+        const staticMouseDownHandler = (e: MouseEvent) => {
+            keyboardMouseDownHandler(e);
+            GlobalModel.getInstance().setIsActive();
+        };
         document.addEventListener("keydown", staticKeyDownHandler);
-        document.addEventListener("mousedown", keyboardMouseDownHandler);
+        document.addEventListener("mousedown", staticMouseDownHandler);
 
         return () => {
             document.removeEventListener("keydown", staticKeyDownHandler);
-            document.removeEventListener("mousedown", keyboardMouseDownHandler);
+            document.removeEventListener("mousedown", staticMouseDownHandler);
         };
     }, []);
     return null;
diff --git a/frontend/app/store/global-model.ts b/frontend/app/store/global-model.ts
index 804e3a18f6..05e84e3774 100644
--- a/frontend/app/store/global-model.ts
+++ b/frontend/app/store/global-model.ts
@@ -3,14 +3,18 @@
 
 import * as WOS from "@/app/store/wos";
 import { ClientModel } from "@/app/store/client-model";
+import { getApi } from "@/store/global";
+import * as util from "@/util/util";
 import { atom, Atom } from "jotai";
 
 class GlobalModel {
     private static instance: GlobalModel;
+    static readonly IsActiveThrottleMs = 5000;
 
     windowId: string;
     builderId: string;
     platform: NodeJS.Platform;
+    lastSetIsActiveTs = 0;
 
     windowDataAtom!: Atom<WaveWindow>;
     workspaceAtom!: Atom<Workspace>;
@@ -47,6 +51,15 @@ class GlobalModel {
             return WOS.getObjectValue(WOS.makeORef("workspace", windowData.workspaceid), get);
         });
     }
+
+    setIsActive(): void {
+        const now = Date.now();
+        if (now - this.lastSetIsActiveTs < GlobalModel.IsActiveThrottleMs) {
+            return;
+        }
+        this.lastSetIsActiveTs = now;
+        util.fireAndForget(() => getApi().setIsActive());
+    }
 }
 
-export { GlobalModel };
\ No newline at end of file
+export { GlobalModel };
diff --git a/frontend/types/custom.d.ts b/frontend/types/custom.d.ts
index 74180391cc..25c40eefef 100644
--- a/frontend/types/custom.d.ts
+++ b/frontend/types/custom.d.ts
@@ -132,6 +132,7 @@ declare global {
         setBuilderWindowAppId: (appId: string) => void; // set-builder-window-appid
         doRefresh: () => void; // do-refresh
         saveTextFile: (fileName: string, content: string) => Promise<boolean>; // save-text-file
+        setIsActive: () => Promise<void>; // set-is-active
     };
 
     type ElectronContextMenuItem = {