diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 73e45ec4cf31..7bde8b255e05 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -8435,6 +8435,12 @@
     githubId = 19296926;
     keys = [ { fingerprint = "DF12 23B1 A9FD C5BE 3DA5  B6F7 904A F1C7 CDF6 95C3"; } ];
   };
+  hxtmdev = {
+    email = "daniel@hxtm.dev";
+    name = "Daniel Höxtermann";
+    github = "hxtmdev";
+    githubId = 7771007;
+  };
   hypersw = {
     email = "baltic@hypersw.net";
     github = "hypersw";
diff --git a/nixos/modules/programs/tmux.nix b/nixos/modules/programs/tmux.nix
index b4b476a801dd..a157bedc8aae 100644
--- a/nixos/modules/programs/tmux.nix
+++ b/nixos/modules/programs/tmux.nix
@@ -16,6 +16,7 @@ let
     set  -g default-terminal "${cfg.terminal}"
     set  -g base-index      ${toString cfg.baseIndex}
     setw -g pane-base-index ${toString cfg.baseIndex}
+    set  -g history-limit   ${toString cfg.historyLimit}
 
     ${optionalString cfg.newSession "new-session"}
 
@@ -50,7 +51,6 @@ let
     setw -g aggressive-resize ${boolToStr cfg.aggressiveResize}
     setw -g clock-mode-style  ${if cfg.clock24 then "24" else "12"}
     set  -s escape-time       ${toString cfg.escapeTime}
-    set  -g history-limit     ${toString cfg.historyLimit}
 
     ${cfg.extraConfigBeforePlugins}
 
@@ -230,4 +230,6 @@ in {
   imports = [
     (lib.mkRenamedOptionModule [ "programs" "tmux" "extraTmuxConf" ] [ "programs" "tmux" "extraConfig" ])
   ];
+
+  meta.maintainers = with lib.maintainers; [ hxtmdev ];
 }