diff --git a/flake.nix b/flake.nix
index 40d1442..dae9078 100644
--- a/flake.nix
+++ b/flake.nix
@@ -16,6 +16,7 @@
     nix-darwin.inputs.nixpkgs.follows = "nixpkgs";
     ip-whitelist.url = "github:Oak-Digital/nixos-ip-whitelist-firewall";
     nix-homebrew.url = "github:zhaofengli/nix-homebrew";
+    inputs.zellij-switch.url = "github:mostafaqanbaryan/zellij-switch";
   };
 
   outputs =
@@ -27,6 +28,7 @@
       nix-homebrew,
       agenix,
       ironbar,
+      zellij-switch,
       ...
     }@inputs:
     let
diff --git a/hosts/dnsc-air/default.nix b/hosts/dnsc-air/default.nix
index a466b61..6dcb840 100644
--- a/hosts/dnsc-air/default.nix
+++ b/hosts/dnsc-air/default.nix
@@ -23,9 +23,14 @@
 
   nix.settings.trusted-users = [ "dennis" ];
 
-  nixpkgs.config = {
-    allowUnfree = true;
-    allowUnsupportedSystem = true;
+  nixpkgs = {
+    config = {
+      allowUnfree = true;
+      allowUnsupportedSystem = true;
+    };
+    overlays = [
+      inputs.zellij-switch.overlays.default
+    ];
   };
 
   # System Packages
@@ -65,6 +70,7 @@
     restic
     devenv
     zellij
+    zellij-switch
   ];
 
   # Homebrew
diff --git a/modules/fish/default.nix b/modules/fish/default.nix
index 655e277..9f3b492 100644
--- a/modules/fish/default.nix
+++ b/modules/fish/default.nix
@@ -53,7 +53,7 @@
       '';
       sessionizer = ''
         set -l selected (fd . $HOME/dev/ -t d -d 1 | fzf)
-        zellij attach --create $selected
+        zellij-switch --session (basename $selected) --cwd $selected --layout default
       '';
       nn = ''
         # Require a title argument