diff --git a/plugin/vimux.vim b/plugin/vimux.vim
index e237a17..0737d74 100644
--- a/plugin/vimux.vim
+++ b/plugin/vimux.vim
@@ -41,12 +41,10 @@ command -bar VimuxClearTerminalScreen :call VimuxClearTerminalScreen()
 command -bar VimuxClearRunnerHistory :call VimuxClearRunnerHistory()
 command -bar VimuxTogglePane :call VimuxTogglePane()
 
-if VimuxOption('VimuxCloseOnExit')
-    augroup VimuxAutocloseCommands
-        au!
-        autocmd VimLeave * call VimuxCloseRunner()
-    augroup END
-endif
+augroup VimuxAutocmds
+  au!
+  autocmd VimLeave * call s:autoclose()
+augroup END
 
 function! VimuxRunCommandInDir(command, useFile) abort
   let l:file = ''
@@ -270,3 +268,9 @@ function! s:hasRunner(index) abort
   let t = VimuxOption('VimuxRunnerType')
   return match(VimuxTmux('list-'.t."s -F '#{".t."_id}'"), a:index)
 endfunction
+
+function! s:autoclose() abort
+  if VimuxOption('VimuxCloseOnExit')
+    call VimuxCloseRunner()
+  endif
+endfunction