diff --git a/home/programs/whatsapp.nix b/home/programs/whatsapp.nix
index 57d5822..9a61e1d 100644
--- a/home/programs/whatsapp.nix
+++ b/home/programs/whatsapp.nix
@@ -6,13 +6,30 @@
 }:
 let
   cfg = config.profile.whatsapp;
+  autostartScript = pkgs.writeShellScriptBin "whatsapp.sh" ''
+    "sleep 10; until ${pkgs.unixtools.ping}/bin/ping -c 1 web.whatsapp.com; do sleep 1; done; whatsapp-for-linux"
+  '';
 in
 {
   config = lib.mkIf cfg.enable {
     home.packages = [ pkgs.whatsapp-for-linux ];
 
     wayland.windowManager.hyprland.settings.exec-once = lib.mkIf cfg.autostart [
-      "sleep 10; until ${pkgs.unixtools.ping}/bin/ping -c 1 web.whatsapp.com; do sleep 1; done; whatsapp-for-linux"
+      "${lib.meta.getExe autostartScript}"
     ];
+
+    home.file.".config/autostart/whatsapp.sh" = lib.mkIf cfg.autostart {
+      source = "${lib.meta.getExe autostartScript}";
+    };
+
+    services.swaync.settings.scripts._10-whatsapp =
+      let
+        focusWindowScript = pkgs.callPackage ../../scripts/hyprland/focus-window.nix { };
+      in
+      {
+        app-name = "whatsapp-for-linux";
+        exec = "${lib.meta.getExe focusWindowScript}";
+        run-on = "action";
+      };
   };
 }