diff --git a/mappings.vim b/mappings.vim
index 2647e76..2c8bf65 100644
--- a/mappings.vim
+++ b/mappings.vim
@@ -106,6 +106,10 @@ inoremap <expr> <cr> ((pumvisible())?("\<C-Y>"):("\<cr>"))
 " Use <esc> to close auto-completion menu
 inoremap <expr> <esc> ((pumvisible())?("\<C-e>"):("\<esc>"))
 
+" Tab-complete, see https://vi.stackexchange.com/q/19675/15292.
+inoremap <expr> <tab> pumvisible() ? "\<c-n>" : "\<tab>"
+inoremap <expr> <s-tab> pumvisible() ? "\<c-p>" : "\<s-tab>"
+
 " Edit and reload init.vim quickly
 nnoremap <silent> <leader>ev :tabnew $MYVIMRC <bar> tcd %:h<cr>
 nnoremap <silent> <leader>sv :silent update $MYVIMRC <bar> source $MYVIMRC <bar>
diff --git a/plugins.vim b/plugins.vim
index aebe6d2..b30a24f 100644
--- a/plugins.vim
+++ b/plugins.vim
@@ -355,10 +355,6 @@ call deoplete#custom#option('auto_complete_delay', 100)
 " Enable deoplete auto-completion
 call deoplete#custom#option('auto_complete', v:true)
 
-" Tab-complete, see https://vi.stackexchange.com/q/19675/15292.
-inoremap <expr> <tab> pumvisible() ? "\<c-n>" : "\<tab>"
-inoremap <expr> <s-tab> pumvisible() ? "\<c-p>" : "\<s-tab>"
-
 """""""""""""""""""""""""UltiSnips settings"""""""""""""""""""
 " Trigger configuration. Do not use <tab> if you use YouCompleteMe
 let g:UltiSnipsExpandTrigger='<c-j>'