diff --git a/_vimrc b/_vimrc
index ea11db1..81e6523 100644
--- a/_vimrc
+++ b/_vimrc
@@ -108,8 +108,7 @@ command! DelThis :call delete(expand('%')) | bdelete!
 " Filetypes
 au BufRead,BufNewFile *.z80 set filetype=z8a
 
-nmap <S-Enter> O<Esc>
-nmap <CR> o<Esc>
+nnoremap <buffer> <CR> <C-]>
 map <Tab> >>
 map <S-Tab> <<
 map <F2> :TOhtml<enter>:wq<enter>:n<enter><F2>