diff --git a/docs/changelog/2225.bugfix.rst b/docs/changelog/2225.bugfix.rst
new file mode 100644
index 000000000..f7cab3e55
--- /dev/null
+++ b/docs/changelog/2225.bugfix.rst
@@ -0,0 +1 @@
+Fix broken prompt set up by activate.bat - by :user:`SiggyBar`.
diff --git a/src/virtualenv/activation/batch/activate.bat b/src/virtualenv/activation/batch/activate.bat
index 2ce9e5ac8..184e4f9e1 100644
--- a/src/virtualenv/activation/batch/activate.bat
+++ b/src/virtualenv/activation/batch/activate.bat
@@ -13,11 +13,11 @@ if defined _OLD_VIRTUAL_PROMPT (
     )
 )
 if not defined VIRTUAL_ENV_DISABLE_PROMPT (
-    set "ENV_PROMPT=__VIRTUAL_PROMPT__"
-    if NOT DEFINED ENV_PROMPT (
-        for %%d in ("%VIRTUAL_ENV%") do set "ENV_PROMPT=(%%~nxd) "
+    if "__VIRTUAL_PROMPT__" NEQ "" (
+        set "PROMPT=__VIRTUAL_PROMPT__%PROMPT%"
+    ) else (
+        for %%d in ("%VIRTUAL_ENV%") do set "PROMPT=(%%~nxd) %PROMPT%"
     )
-    set "PROMPT=%ENV_PROMPT%%PROMPT%"
 )
 
 REM Don't use () to avoid problems with them in %PATH%