diff --git a/profiles/neovim.nix b/profiles/neovim.nix
index 2b8e72e..6fb9116 100644
--- a/profiles/neovim.nix
+++ b/profiles/neovim.nix
@@ -73,6 +73,14 @@
           " Trigger for numbertoggle to switch modes
           nnoremap <silent> <C-n> :set relativenumber!<CR>
 
+          " Tab settings
+          let g:SuperTabDefaultCompletionType = 'context'
+          let g:SuperTabContextTextOmniPrecedence = ['&omnifunc','&completefunc']
+          let g:SuperTabRetainCompletionType=2
+
+          inoremap <expr><Enter>  pumvisible() ? "\<C-Y>" : "\<Enter>"
+          inoremap <expr><TAB>  pumvisible() ? "\<C-n>" : "\<TAB>"
+
           nnoremap <silent> <Leader>RemoveTrailingWhiteSpace :call TrimWhiteSpace()<CR>
           autocmd FileWritePre    * :call TrimWhiteSpace()
           autocmd FileAppendPre   * :call TrimWhiteSpace()