diff --git a/modules/users/default.nix b/modules/users/default.nix
index 0cb43503..b636d6fe 100644
--- a/modules/users/default.nix
+++ b/modules/users/default.nix
@@ -31,6 +31,12 @@ let
     then "/run/current-system/sw${v.shellPath}"
     else v;
 
+  systemShells =
+    let
+      shells = mapAttrsToList (_: u: u.shell) cfg.users;
+    in
+      filter types.shellPackage.check shells;
+
 in
 
 {
@@ -259,6 +265,9 @@ in
       '') deletedUsers}
     '';
 
+    # Install all the user shells
+    environment.systemPackages = systemShells;
+
     environment.etc = mapAttrs' (name: { packages, ... }: {
       name = "profiles/per-user/${name}";
       value.source = pkgs.buildEnv {