diff --git a/config/nvim/lua/plugins-setup.lua b/config/nvim/lua/plugins-setup.lua
index be7cf24..c02cc69 100644
--- a/config/nvim/lua/plugins-setup.lua
+++ b/config/nvim/lua/plugins-setup.lua
@@ -28,3 +28,5 @@ require("iswap").setup({
   keys = "1234567890",
   autoswap = true
 })
+
+require("focus").setup()
diff --git a/config/nvim/lua/plugins.lua b/config/nvim/lua/plugins.lua
index 2540c13..4de70be 100644
--- a/config/nvim/lua/plugins.lua
+++ b/config/nvim/lua/plugins.lua
@@ -99,18 +99,7 @@ return require("packer").startup(function(use)
   })
 
   -- Window management
-  use({
-    "sindrets/winshift.nvim",
-    config = function ()
-      require("winshift").setup({
-        highlight_moving_win = true,
-        window_picker_ignore = {
-          filetype = { "NvimTree" },
-          buftype = { "terminal" }
-        }
-      })
-    end
-  })
+  use({ "beauwilliams/focus.nvim" })
 
   use({ "mizlan/iswap.nvim" })
 end)
diff --git a/config/nvim/lua/remaps.lua b/config/nvim/lua/remaps.lua
index 2f60ac2..27ae2e3 100644
--- a/config/nvim/lua/remaps.lua
+++ b/config/nvim/lua/remaps.lua
@@ -77,9 +77,6 @@ nmap("<leader>t", ":ToggleTerminal<CR>")
 -- Git
 nmap("<leader>gg", ":G<CR>")
 
--- Winshift (move buffers across neovim)
-nmap("<leader>m", "<cmd>WinShift<CR>")
-
 -- Iswap
 nmap("<leader>sw", ":ISwap<CR>")