diff --git a/autoload/jedi.vim b/autoload/jedi.vim
index 1ca5571..d6ca28e 100644
--- a/autoload/jedi.vim
+++ b/autoload/jedi.vim
@@ -110,12 +110,12 @@ endfunction
 " ------------------------------------------------------------------------
 function! jedi#new_buffer(path)
     if g:jedi#use_tabs_not_buffers
-        python jedi_vim.tabnew(vim.eval('a:path'))
+        python jedi_vim.tabnew(jedi_vim.escape_file_path(vim.eval('a:path')))
     else
         if !&hidden && &modified
             w
         endif
-        execute 'edit '.a:path
+        python vim.execute('edit ' + vim.eval(jedi_vim.escape_file_path(vim.eval('a:path'))))
     endif
 endfunction
 
diff --git a/jedi b/jedi
index ce0aadc..b3c89ef 160000
--- a/jedi
+++ b/jedi
@@ -1 +1 @@
-Subproject commit ce0aadc9a531f310b087045ec947add5d8187bca
+Subproject commit b3c89effe7dad1b9cc1359b8c345b606da23848c
diff --git a/plugin/jedi_vim.py b/plugin/jedi_vim.py
index 7973ca4..e507489 100644
--- a/plugin/jedi_vim.py
+++ b/plugin/jedi_vim.py
@@ -299,5 +299,9 @@ def tabnew(path):
         vim.command('tabnew %s' % path)
 
 
+def escape_file_path(path):
+    return path.replace(' ', r'\ ')
+
+
 def print_to_stdout(level, str_out):
     print(str_out)