diff --git a/.emacs.d/init.el b/.emacs.d/init.el
index adf0e54..4838c6d 100644
--- a/.emacs.d/init.el
+++ b/.emacs.d/init.el
@@ -378,6 +378,9 @@
         ("gnu" . "http://elpa.gnu.org/packages/")
         ("marmalade" . "http://marmalade-repo.org/packages/")))
 
+;;-----[ Windmove ]------------------------------------------------------
+(windmove-default-keybindings 'meta)
+
 ;;-----[ Misc ]----------------------------------------------------------
 (defun oni/reload-buffer
   (interactive)
@@ -427,10 +430,6 @@
 (global-set-key "\C-m" 'newline-and-indent)
 (global-set-key (kbd "C-x n r") 'narrow-to-region)
 (global-set-key [f5] 'oni/reload-buffer)
-(global-set-key [M-left] 'windmove-left)
-(global-set-key [M-right] 'windmove-right)
-(global-set-key [M-up] 'windmove-up)
-(global-set-key [M-down] 'windmove-down)
 
 (add-hook 'before-save-hook 'oni/before-save-hook)
 (add-hook 'after-save-hook 'oni/after-save-hook)