diff --git a/home-modules/desktop.nix b/home-modules/desktop.nix
index a96f5da..e4ed242 100644
--- a/home-modules/desktop.nix
+++ b/home-modules/desktop.nix
@@ -12,7 +12,7 @@ let
         "${homeLib.zenStartup}/share/applications/zen-startup.desktop"
         "${homeLib.ghosttyZellijStartup}/share/applications/ghostty-zellij-startup.desktop"
         "${pkgs.slack}/share/applications/slack.desktop"
-        "${homeLib.betterbirdStartup}/share/applications/betterbird-startup.desktop"
+        "${homeLib.betterbird}/share/applications/betterbird.desktop"
       ]
     else
       [
@@ -20,7 +20,7 @@ let
         "${homeLib.ghosttyZellijStartup}/share/applications/ghostty-zellij-startup.desktop"
         "${homeLib.signalStartup}/share/applications/signal-startup.desktop"
         "${pkgs.slack}/share/applications/slack.desktop"
-        "${homeLib.betterbirdStartup}/share/applications/betterbird-startup.desktop"
+        "${homeLib.betterbird}/share/applications/betterbird.desktop"
         "${homeLib.vesktopStartup}/share/applications/vesktop-startup.desktop"
         "${homeLib.zulipStartup}/share/applications/zulip-startup.desktop"
       ];
diff --git a/home-modules/lib.nix b/home-modules/lib.nix
index 0ff49e4..747f6ed 100644
--- a/home-modules/lib.nix
+++ b/home-modules/lib.nix
@@ -55,6 +55,7 @@ let
       pkgs.autoPatchelfHook
       pkgs.makeWrapper
       pkgs.patchelfUnstable
+      pkgs.wrapGAppsHook3
     ];
 
     # Mozilla binaries use relrhack, which breaks if patchelf clobbers sections.
@@ -105,8 +106,10 @@ let
       mkdir -p "$out/lib" "$out/bin" "$out/share"
       cp -r betterbird "$out/lib/betterbird"
 
-      makeWrapper "$out/lib/betterbird/betterbird" "$out/bin/betterbird" \
-        --prefix LD_LIBRARY_PATH : "${pkgs.lib.makeLibraryPath buildInputs}"
+      ln -s "$out/lib/betterbird/betterbird" "$out/bin/betterbird"
+
+      gappsWrapperArgs+=(--argv0 "$out/bin/.betterbird-wrapped")
+      gappsWrapperArgs+=(--prefix LD_LIBRARY_PATH : "${pkgs.lib.makeLibraryPath buildInputs}")
 
       if [ -d "$out/lib/betterbird/chrome/icons/default" ]; then
         mkdir -p "$out/share/icons/hicolor/128x128/apps"
@@ -124,7 +127,8 @@ let
       Icon=betterbird
       Categories=Network;Email;
       MimeType=x-scheme-handler/mailto;message/rfc822;x-scheme-handler/webcal;x-scheme-handler/webcals;
-      StartupNotify=true
+      StartupNotify=false
+      StartupWMClass=eu.betterbird.Betterbird
       EOF
 
       runHook postInstall