diff --git a/autoload/vebugger.vim b/autoload/vebugger.vim
index c9d127e..d7b0938 100644
--- a/autoload/vebugger.vim
+++ b/autoload/vebugger.vim
@@ -289,6 +289,7 @@ function! vebugger#killDebugger()
         autocmd!
     augroup END
     if exists('s:debugger')
+        call vebugger#std#closeShellBuffer(s:debugger)
         call s:debugger.closeTerminalBuffer()
         call s:debugger.kill()
         unlet s:debugger
diff --git a/autoload/vebugger/std.vim b/autoload/vebugger/std.vim
index f14973c..e72ad15 100644
--- a/autoload/vebugger/std.vim
+++ b/autoload/vebugger/std.vim
@@ -101,6 +101,18 @@ function! vebugger#std#openShellBuffer(debugger)
     wincmd p
 endfunction
 
+"Closes the shell buffer
+function! vebugger#std#closeShellBuffer(debugger)
+    if has_key(a:debugger,'shellBuffer')
+        if -1<bufwinnr(a:debugger.shellBuffer)
+            let l:bufwin=bufwinnr(a:debugger.shellBuffer)
+            exe l:bufwin.'wincmd w'
+            wincmd c
+            wincmd p
+        endif
+    endif
+endfunction
+
 let s:standardFunctions={}
 
 "Write a line to the shell buffer