diff --git a/hosts/pinwheel/modules/firefox/default.nix b/hosts/pinwheel/modules/firefox/default.nix
index 9d4cb27..620a8ff 100644
--- a/hosts/pinwheel/modules/firefox/default.nix
+++ b/hosts/pinwheel/modules/firefox/default.nix
@@ -40,6 +40,13 @@ let
     '';
   };
 
+  ff-work = pkgs.writeShellApplication {
+    name = "ff-work";
+    text = ''
+      ${wrapped}/bin/firefox-devedition -P work --new-window "$@"
+    '';
+  };
+
   sharedSettings = {
     "general.smoothScroll" = true;
     "apz.gtk.kinetic_scroll.enabled" = false;
@@ -118,6 +125,7 @@ in
     home.packages = [
       ff
       ff-alex
+      ff-work
     ];
   };
 
diff --git a/hosts/pinwheel/modules/work/default.nix b/hosts/pinwheel/modules/work/default.nix
index 10cb83f..60b4b05 100644
--- a/hosts/pinwheel/modules/work/default.nix
+++ b/hosts/pinwheel/modules/work/default.nix
@@ -9,6 +9,18 @@ let
   gitEnabled = config.mod.git.enable;
   goEnabled = config.mod.go.enable;
   openvpnEnabled = config.mod.openvpn.enable;
+
+  xdg-open-work = pkgs.writeShellScriptBin "xdg-open" ''
+    exec ff-work "$@"
+  '';
+  graphite-cli = pkgs.symlinkJoin {
+    name = "graphite-cli";
+    paths = [ pkgs.graphite-cli ];
+    nativeBuildInputs = [ pkgs.makeWrapper ];
+    postBuild = ''
+      wrapProgram $out/bin/gt --prefix PATH : ${xdg-open-work}/bin
+    '';
+  };
 in
 {
   home-manager.users.alex = {
@@ -77,7 +89,7 @@ EOF
         pkgs.google-cloud-sdk.components.gke-gcloud-auth-plugin
       ])
 
-      pkgs.graphite-cli
+      graphite-cli
 
       pkgs.postman
       pkgs.grpcurl