diff --git a/modules/fish/default.nix b/modules/fish/default.nix
index 18b6935..3f90c74 100644
--- a/modules/fish/default.nix
+++ b/modules/fish/default.nix
@@ -53,7 +53,8 @@
       '';
       sessionizer = ''
         set -l selected (fd . $HOME/dev/ -t d -d 1 | fzf)
-        zellij pipe --plugin file:${pkgs.zellij-switch}/bin/zellij-switch.wasm -- "--session (basename $selected) --cwd $selected --layout default"
+        set -l session_name (basename $selected)
+        zellij pipe --plugin file:${pkgs.zellij-switch}/bin/zellij-switch.wasm -- "--session $session_name --cwd $selected --layout default"
       '';
       nn = ''
         # Require a title argument
diff --git a/modules/zellij/default.nix b/modules/zellij/default.nix
index 2135855..c4b1cb7 100644
--- a/modules/zellij/default.nix
+++ b/modules/zellij/default.nix
@@ -4,6 +4,10 @@
     source = config.lib.file.mkOutOfStoreSymlink "${config.home.homeDirectory}/dev/nix-config/modules/zellij/config.kdl";
   };
 
+  xdg.configFile."zellij/layouts" = {
+    source = config.lib.file.mkOutOfStoreSymlink "${config.home.homeDirectory}/dev/nix-config/modules/zellij/layouts";
+  };
+
   programs.zellij = {
     enable = true;
     enableFishIntegration = true;
diff --git a/modules/zellij/layouts/default.kdl b/modules/zellij/layouts/default.kdl
new file mode 100644
index 0000000..8ce2ddf
--- /dev/null
+++ b/modules/zellij/layouts/default.kdl
@@ -0,0 +1,9 @@
+layout {
+    pane size=1 borderless=true {
+        plugin location="tab-bar"
+    }
+    pane
+    pane size=1 borderless=true {
+        plugin location="status-bar"
+    }
+}