diff --git a/python3/vimspector/code.py b/python3/vimspector/code.py
index 4b21192..e62a9ff 100644
--- a/python3/vimspector/code.py
+++ b/python3/vimspector/code.py
@@ -22,7 +22,7 @@ from vimspector import utils
 
 
 class CodeView( object ):
-  def __init__( self, window, api_prefix ):
+  def __init__( self, window, original_window, api_prefix ):
     self._window = window
     self._api_prefix = api_prefix
 
@@ -40,7 +40,9 @@ class CodeView( object ):
       'breakpoints': []
     }
 
+
     with utils.LetCurrentWindow( self._window ):
+      vim.current.buffer = original_window.buffer
       vim.command( 'nnoremenu WinBar.Continue :call vimspector#Continue()<CR>' )
       vim.command( 'nnoremenu WinBar.Next :call vimspector#StepOver()<CR>' )
       vim.command( 'nnoremenu WinBar.Step :call vimspector#StepInto()<CR>' )
diff --git a/python3/vimspector/debug_session.py b/python3/vimspector/debug_session.py
index 2f26e4f..9c60ab8 100644
--- a/python3/vimspector/debug_session.py
+++ b/python3/vimspector/debug_session.py
@@ -445,11 +445,15 @@ class DebugSession( object ):
 
 
   def _SetUpUI( self ):
+    original_window = vim.current.window
+
     vim.command( 'tabnew' )
     self._uiTab = vim.current.tabpage
 
     # Code window
-    self._codeView = code.CodeView( vim.current.window, self._api_prefix )
+    self._codeView = code.CodeView( vim.current.window,
+                                    original_window,
+                                    self._api_prefix )
 
     # Call stack
     with utils.TemporaryVimOptions( { 'splitright':  False,