diff --git a/inputrc b/inputrc
index c086fbc..07c14db 100644
--- a/inputrc
+++ b/inputrc
@@ -1,5 +1,5 @@
-#set editing-mode vi
-#set keymap vi
+set editing-mode vi
+set keymap vi-command
 set completion-ignore-case on
 #set completion-map-case on
 #set show-all-if-ambiguous on
diff --git a/vim/vimrc b/vim/vimrc
index b676e97..c7638ba 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -59,8 +59,13 @@ filetype plugin on
 filetype indent on
 
 noremap <S-Space> <Esc>
-imap kj <ESC>
-imap jk <ESC>
+
+
+"Wrist pain
+inoremap kj <ESC>
+
+"Will quickly get rid of the habit
+inoremap <Esc> <ESC>:wq<Enter>
 
 noremap j gj
 noremap k gk