diff --git a/nixos/modules/config/shells-environment.nix b/nixos/modules/config/shells-environment.nix
index 9642981803bf..89b8a04b5e7c 100644
--- a/nixos/modules/config/shells-environment.nix
+++ b/nixos/modules/config/shells-environment.nix
@@ -150,6 +150,10 @@ in
 
     system.build.binsh = pkgs.bashInteractive;
 
+    # Ensure TERMINFO is set appropriately *before* user shells are run,
+    # as they may depend on it
+    environment.sessionVariables.TERMINFO = "/run/current-system/sw/share/terminfo";
+
     # Set session variables in the shell as well. This is usually
     # unnecessary, but it allows changes to session variables to take
     # effect without restarting the session (e.g. by opening a new