diff --git a/vimrc b/vimrc
index 7268309..96d051f 100644
--- a/vimrc
+++ b/vimrc
@@ -68,7 +68,7 @@ set pastetoggle=<f2>
 " See :help thesaurus
 set thesaurus=$HOME/Documents/thesaurus/thesaurus_pkg/thesaurus.txt
 set pumheight=200
-set completeopt=menu,menuone,popup,longest,noselect
+set completeopt=menu,menuone,popup,noselect
 set completepopup=width:300,height:50,align:item,border:off
 
 " Colour scheme:
@@ -141,18 +141,18 @@ map <Leader>8 :call RequestGrep()<CR>
 packadd! deoplete.nvim
 let g:deoplete#enable_at_startup = 1
 call deoplete#custom#option('num_processes', 6)
-call deoplete#custom#option('max_list', 20)
+call deoplete#custom#option('max_list', 50)
 call deoplete#custom#option('auto_complete_delay', 10)
 call deoplete#custom#option('auto_refresh_delay', 10)
 " https://github.com/Shougo/deoplete.nvim/issues/965#issuecomment-482925193
 " Seems to be causing autocomplete issues so removing for now.
-" call deoplete#custom#option('omni_patterns', {
-" \ 'go': '[^. *\t]\.\w*',
-" \})
+call deoplete#custom#option('omni_patterns', {
+\ 'go': '[^. *\t]\.\w*',
+\})
 " <TAB>: completion.
 inoremap <expr><S-Tab>  pumvisible() ? "\<C-p>" : "\<S-Tab>"
 inoremap <expr><Tab>  pumvisible() ? "\<C-n>" : "\<Tab>"
-inoremap <expr><Enter> pumvisible() ? "\<C-y>" : "\<Enter>"
+inoremap <expr><C-]> pumvisible() ? "\<C-]>" : "\<Enter>"
 
 " vim-markdown configuration:
 let g:vim_markdown_conceal = 1