diff --git a/autoload/jedi.vim b/autoload/jedi.vim
index cb5365d..97111d1 100644
--- a/autoload/jedi.vim
+++ b/autoload/jedi.vim
@@ -204,7 +204,11 @@ function! s:save_first_col()
         " new line, substitude a word), join that change with the rest of this
         " edit.
         if b:normaltick != b:changedtick
-            undojoin
+            try
+                undojoin
+            catch /^Vim\%((\a\+)\)\=:E790/
+                " This can happen if an undo happens during a :normal command.
+            endtry
         endif
     endtry
 endfunction