diff --git a/init.vim b/init.vim
index 9229c6c..b8f003b 100644
--- a/init.vim
+++ b/init.vim
@@ -146,8 +146,9 @@ let g:deoplete#enable_at_startup = 1
 " Autoclose preview
 autocmd CursorMovedI * if pumvisible() == 0|pclose|endif
 autocmd InsertLeave * if pumvisible() == 0|pclose|endif
-" Complete on tab
-inoremap <expr><TAB>  pumvisible() ? "\<C-n>" : "\<TAB>"
+inoremap <expr> <Tab> pumvisible() ? "\<C-n>" : "\<Tab>"
+inoremap <expr> <S-Tab> pumvisible() ? "\<C-p>" : "\<S-Tab>"
+inoremap <expr> <cr> pumvisible() ? "\<C-y>" : "\<cr>"
 
 if executable('rls')
     au User lsp_setup call lsp#register_server({