diff --git a/.config/vim/vimrc.d/40-keybindings.vim b/.config/vim/vimrc.d/40-keybindings.vim
index 463044f..7a58f41 100644
--- a/.config/vim/vimrc.d/40-keybindings.vim
+++ b/.config/vim/vimrc.d/40-keybindings.vim
@@ -113,3 +113,9 @@ endif
 
 " Y should behave like D & C does
 nnoremap Y y$
+
+" Move lines up and down while correcting the indentation
+nnoremap <A-Up> ddkP==
+nnoremap <A-Down> ddp==
+vmap <A-Up> dkPgp=gv
+vmap <A-Down> dpgp=gv