diff --git a/dotfiles/xmonad/xmonad.hs b/dotfiles/xmonad/xmonad.hs
index eff4c142..33fb4227 100644
--- a/dotfiles/xmonad/xmonad.hs
+++ b/dotfiles/xmonad/xmonad.hs
@@ -50,6 +50,7 @@ import           XMonad.Layout.NoBorders
 import qualified XMonad.Layout.Renamed as RN
 import           XMonad.Layout.Spacing
 import           XMonad.Layout.Tabbed
+import           XMonad.Layout.WindowNavigation
 import qualified XMonad.StackSet as W
 import           XMonad.Util.CustomKeys
 import qualified XMonad.Util.Dmenu as DM
@@ -686,6 +687,16 @@ addKeys conf@XConfig { modMask = modm } =
     , ((modm .|. shiftMask, xK_z), shiftToEmptyNextScreen)
     , ((modm .|. shiftMask, xK_h), shiftToEmptyAndView)
 
+    -- 2D Navigation
+   , ((hctrl, xK_h), sendMessage $ Go L)
+   , ((hctrl, xK_l), sendMessage $ Go R)
+   , ((hctrl, xK_k), sendMessage $ Go U)
+   , ((hctrl, xK_j), sendMessage $ Go D)
+   , ((hctrl .|. shiftMask, xK_h), sendMessage $ Swap L)
+   , ((hctrl .|. shiftMask, xK_l), sendMessage $ Swap R)
+   , ((hctrl .|. shiftMask, xK_k), sendMessage $ Swap U)
+   , ((hctrl .|. shiftMask, xK_j), sendMessage $ Swap D)
+
     -- These need to be rebound to support boringWindows
     , ((modm, xK_j), focusDown)
     , ((modm, xK_k), focusUp)