diff --git a/init.vim b/init.vim
index 25b463b..c191f4e 100644
--- a/init.vim
+++ b/init.vim
@@ -44,7 +44,6 @@ set showcmd
 
 set ignorecase smartcase
 set inccommand=split
-set completeopt=menu,noinsert,preview
 set wildmode=list:longest,list:full
 set wildignore+=*.so,*.swp,*.zip,*.o
 set suffixes=.bak,~,.h,.info,.swp,.obj,.info,.aux,.dvi,.bbl,.out,.o,.lo,\.class
@@ -52,6 +51,9 @@ set suffixes+=.pdf
 set wildmenu
 set hidden
 
+set completeopt=menu,noinsert,preview
+inoremap <expr> <CR> pumvisible() ? "\<C-y>" : "\<C-g>u\<CR>"
+
 set mouse=
 
 set cursorline