diff --git a/autoload/jedi.vim b/autoload/jedi.vim
index 1a00fb5..4776696 100644
--- a/autoload/jedi.vim
+++ b/autoload/jedi.vim
@@ -130,6 +130,8 @@ if 1:
         vim.command('normal! diw')
         vim.command(':startinsert')
     else:
+        cursor = vim.current.window.cursor
+        window_path = vim.current.buffer.name
         # reset autocommand
         vim.command('autocmd! jedi_rename InsertLeave')
 
@@ -150,6 +152,8 @@ if 1:
                 vim.current.window.cursor = r.start_pos
                 vim.command('normal! cw%s' % replace)
 
+            vim.current.window.cursor = cursor
+            vim.eval("jedi#new_buffer('%s')" % window_path)
             echo_highlight('Jedi did %s renames!' % len(temp_rename))
         # reset rename variables
         temp_rename = None
diff --git a/jedi b/jedi
index f6d2fdc..111f7c6 160000
--- a/jedi
+++ b/jedi
@@ -1 +1 @@
-Subproject commit f6d2fdcf592e89b0bb96fb61cd4f7bd557dc91c5
+Subproject commit 111f7c637f52072cd381c011609097c4a994e4e9