diff --git a/plugins/virtualenv/virtualenv.plugin.zsh b/plugins/virtualenv/virtualenv.plugin.zsh
index 8e06450b1..774bf88b5 100644
--- a/plugins/virtualenv/virtualenv.plugin.zsh
+++ b/plugins/virtualenv/virtualenv.plugin.zsh
@@ -6,3 +6,4 @@ function virtualenv_prompt_info(){
 
 # disables prompt mangling in virtual_env/bin/activate
 export VIRTUAL_ENV_DISABLE_PROMPT=1
+export VIRTUAL_ENV_DISABLE_PROMPT_BY_PLUGIN=1
diff --git a/themes/agnoster.zsh-theme b/themes/agnoster.zsh-theme
index 2db565266..3b720feb2 100644
--- a/themes/agnoster.zsh-theme
+++ b/themes/agnoster.zsh-theme
@@ -137,7 +137,11 @@ prompt_dir() {
 # Virtualenv: current working virtualenv
 prompt_virtualenv() {
   local virtualenv_path="$VIRTUAL_ENV"
-  if [[ -n $virtualenv_path && -z $VIRTUAL_ENV_DISABLE_PROMPT ]]; then
+  if [[ -n $virtualenv_path && 
+      ( -z $VIRTUAL_ENV_DISABLE_PROMPT || 
+        ( -n $VIRTUAL_ENV_DISABLE_PROMPT && 
+          -n $VIRTUAL_ENV_DISABLE_PROMPT_BY_PLUGIN ) 
+      ) ]]; then
     prompt_segment blue black "(`basename $virtualenv_path`)"
   fi
 }