diff --git a/config/nvim/lua/plugins.lua b/config/nvim/lua/plugins.lua
index 5cec775..4fac849 100644
--- a/config/nvim/lua/plugins.lua
+++ b/config/nvim/lua/plugins.lua
@@ -64,9 +64,10 @@ return require("packer").startup(function(use)
   use({
     "lukas-reineke/indent-blankline.nvim",
     config = function ()
+      vim.cmd("let g:indent_blankline_filetype_exclude = ['help']")
       require("indent_blankline").setup({
         char = "|",
-        buftype_exclude = { "terminal" }
+        buftype_exclude = { "terminal" },
       })
     end
   })
@@ -78,4 +79,18 @@ return require("packer").startup(function(use)
       require("lightspeed").setup()
     end
   })
+
+  -- Window management
+  use({
+    "sindrets/winshift.nvim",
+    config = function ()
+      require("winshift").setup({
+        highlight_moving_win = true,
+        window_picker_ignore = {
+          filetype = { "NvimTree" },
+          buftype = { "terminal" }
+        }
+      })
+    end
+  })
 end)
diff --git a/config/nvim/lua/remaps.lua b/config/nvim/lua/remaps.lua
index d1993dd..a21020c 100644
--- a/config/nvim/lua/remaps.lua
+++ b/config/nvim/lua/remaps.lua
@@ -76,3 +76,6 @@ nmap("<leader>t", ":ToggleTerminal<CR>")
 
 -- Git
 nmap("<leader>gg", ":G<CR>")
+
+-- Winshift (move buffers across neovim)
+nmap("<leader>m", "<cmd>WinShift<CR>")