diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3c03941..d72a2f7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## 27th February 2024
+
+### Changed
+
+* Replace `christoomey/vim-tmux-navigator` with `alexghergh/nvim-tmux-navigation`.
+
 ## 26th February 2024
 
 ### Added
diff --git a/after/plugin/nvim-tmux-navigation.lua b/after/plugin/nvim-tmux-navigation.lua
new file mode 100644
index 0000000..6f1318f
--- /dev/null
+++ b/after/plugin/nvim-tmux-navigation.lua
@@ -0,0 +1,12 @@
+require("nvim-tmux-navigation").setup {
+  disable_when_zoomed = true,
+
+  keybindings = {
+    down = "<C-j>",
+    last_active = "<C-\\>",
+    left = "<C-h>",
+    next = "<C-Space>",
+    right = "<C-l>",
+    up = "<C-k>",
+  },
+}
diff --git a/lib/default.nix b/lib/default.nix
index 3ffed94..ca8e9ae 100644
--- a/lib/default.nix
+++ b/lib/default.nix
@@ -36,6 +36,16 @@ in rec {
     pkgs2305 = inputs.nixpkgs-2305.legacyPackages.${system};
 
     customVim = {
+      nvim-tmux-navigation = pkgs.vimUtils.buildVimPlugin {
+        name = "nvim-tmux-navigation";
+        src = pkgs.fetchFromGitHub {
+          owner = "alexghergh";
+          repo = "nvim-tmux-navigation";
+          rev = "4898c98702954439233fdaf764c39636681e2861";
+          sha256 = "CxAgQSbOrg/SsQXupwCv8cyZXIB7tkWO+Y6FDtoR8xk=";
+        };
+      };
+
       tabline-vim = pkgs.vimUtils.buildVimPlugin {
         name = "tabline-vim";
         src = pkgs.fetchFromGitHub {
@@ -89,6 +99,7 @@ in rec {
 
     opdavies-nvim = mkVimPlugin {inherit system;};
   in [
+    customVim.nvim-tmux-navigation
     customVim.tabline-vim
     customVim.vim-caser
     customVim.vim-heritage
@@ -118,7 +129,6 @@ in rec {
     vimPlugins.vim-sleuth
     vimPlugins.vim-terraform
     vimPlugins.vim-textobj-user
-    vimPlugins.vim-tmux-navigator
     vimPlugins.vim-unimpaired
 
     # {