diff --git a/nvim/init.vim b/nvim/init.vim
index bbb4ad2..2ca3206 100644
--- a/nvim/init.vim
+++ b/nvim/init.vim
@@ -165,7 +165,7 @@ set fileformat=unix
 
 set clipboard^=unnamed,unnamedplus
 set backspace=indent,eol,start
-set completeopt=menu,noselect,preview,noinsert
+set completeopt+=menu,noselect,preview,noinsert
 " Required for vim-workspace
 " See https://github.com/thaerkh/vim-workspace/issues/11
 set sessionoptions-=blank
@@ -326,6 +326,23 @@ augroup ToggleSearchHighlighting
 	autocmd InsertLeave * setlocal hlsearch
 augroup END
 
+" Close QF window if it is last window
+augroup QFClose
+  au!
+  au WinEnter * if winnr('$') == 1 && &buftype == "quickfix"|q|endif
+augroup END
+
+" Taken from http://seenaburns.com/vim-setup-for-rust/
+" Neomake
+" Gross hack to stop Neomake running when exitting because it creates a zombie cargo check process
+" which holds the lock and never exits. But then, if you only have QuitPre, closing one pane will
+" disable neomake, so BufEnter reenables when you enter another buffer.
+let s:quitting = 0
+au QuitPre *.rs let s:quitting = 1
+au BufEnter *.rs let s:quitting = 0
+au BufWritePost *.rs if ! s:quitting | Neomake | else | echom "Neomake disabled"| endif
+let g:neomake_warning_sign = {'text': '?'}
+
 let g:haskell_enable_quantification = 1   " to enable highlighting of `forall`
 let g:haskell_enable_recursivedo = 1      " to enable highlighting of `mdo` and `rec`
 let g:haskell_enable_arrowsyntax = 1      " to enable highlighting of `proc`