diff --git a/modules/core/user.nix b/modules/core/user.nix
index 70be1f6..c2863b6 100644
--- a/modules/core/user.nix
+++ b/modules/core/user.nix
@@ -40,5 +40,8 @@ in
     ignoreShellProgramCheck = true;
   };
 
+  # Set /etc/shells so GDM will show our user when ZSH is selected
+  environment.shells = with pkgs; [ pkgs.${shellCfg.defaultShell} ];
+
   nix.settings.allowed-users = [ "${username}" ];
 }
\ No newline at end of file