diff --git a/modules/completion/external b/modules/completion/external
index cf565254e2..ed4ff5384b 160000
--- a/modules/completion/external
+++ b/modules/completion/external
@@ -1 +1 @@
-Subproject commit cf565254e26bb7ce03f51889e9a29953b955b1fb
+Subproject commit ed4ff5384b03aa775a57d4c9588c88850026b0b3
diff --git a/modules/editor/init.zsh b/modules/editor/init.zsh
index 28a2fb24a0..5b411f58a9 100644
--- a/modules/editor/init.zsh
+++ b/modules/editor/init.zsh
@@ -318,6 +318,7 @@ bindkey -M vicmd "$key_info[Control]X$key_info[Control]E" edit-command-line
 
 # Undo/Redo
 bindkey -M vicmd "u" undo
+bindkey -M viins "$key_info[Control]_" undo
 bindkey -M vicmd "$key_info[Control]R" redo
 
 if (( $+widgets[history-incremental-pattern-search-backward] )); then
diff --git a/modules/python/init.zsh b/modules/python/init.zsh
index 33248bae74..b878f04978 100644
--- a/modules/python/init.zsh
+++ b/modules/python/init.zsh
@@ -71,7 +71,7 @@ function _python-workon-cwd {
   if [[ "$ENV_NAME" != "" ]]; then
     # Activate the environment only if it is not already active
     if [[ "$VIRTUAL_ENV" != "$WORKON_HOME/$ENV_NAME" ]]; then
-      if [[ -e "$WORKON_HOME/$ENV_NAME/bin/activate" ]]; then
+      if [[ -n "$WORKON_HOME" && -e "$WORKON_HOME/$ENV_NAME/bin/activate" ]]; then
         workon "$ENV_NAME" && export CD_VIRTUAL_ENV="$ENV_NAME"
       elif [[ -e "$ENV_NAME/bin/activate" ]]; then
         source $ENV_NAME/bin/activate && export CD_VIRTUAL_ENV="$ENV_NAME"