diff --git a/nvim/init.vim b/nvim/init.vim
index e642490..6c0341f 100644
--- a/nvim/init.vim
+++ b/nvim/init.vim
@@ -52,8 +52,9 @@ if has('autocmd')
 		autocmd TermClose * call feedkeys('\<cr>')
 	augroup END
 endif
-command -nargs=? Terminal 16split|terminal <args>
-nnoremap <silent> <leader>tt :16split<cr>:terminal<cr>
+command -nargs=? Terminal rightbelow 16split +terminal\ <args>
+nnoremap <silent> <leader>tt :rightbelow 16split +terminal<cr>
+tnoremap <Esc> <C-\><C-n><C-w>p
 
 " Theming
 let g:aldmeris_transparent = v:true
diff --git a/vim/vimrc b/vim/vimrc
index 5ebccb9..31a0428 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -45,8 +45,9 @@ let g:indentLine_leadingSpaceEnabled = v:true
 
 runtime! language_server.vim
 
-command -nargs=? Terminal terminal ++rows=16 <args>
-nnoremap <silent> <leader>tt :terminal ++rows=16<CR>
+command -nargs=? Terminal rightbelow terminal ++rows=16 <args>
+nnoremap <silent> <leader>tt :rightbelow terminal ++rows=16<CR>
+tnoremap <Esc> <C-\><C-n><C-w>p
 
 " Theming
 let g:aldmeris_transparent = v:true