diff --git a/core/cli/env.el b/core/cli/env.el
index 7e6021c8b..c6fb2f615 100644
--- a/core/cli/env.el
+++ b/core/cli/env.el
@@ -64,10 +64,8 @@ It is rare that you'll need to change this.")
 
 (defvar doom-env-switches
   (if IS-WINDOWS
-      '("-c")
-    ;; Execute twice, once in a non-interactive login shell and once in an
-    ;; interactive shell in order to capture all the init files possible.
-    '("-ic"))
+      "-c"
+    "-ic") ; Execute in an interactive shell
   "The `shell-command-switch'es to use on `doom-env-executable'.
 This is a list of strings. Each entry is run separately and in sequence with
 `doom-env-executable' to scrape envvars from your shell environment.")
@@ -93,11 +91,10 @@ order of `doom-env-switches' determines priority."
           "# ---------------------------------------------------------------------------\n"
           "# This file was auto-generated by Doom by running:\n"
           "#\n"
-          (cl-loop for switch in doom-env-switches
-                   concat (format "#   %s %s %s\n"
-                                  shell-file-name
-                                  switch
-                                  doom-env-executable))
+          (format "#   %s %s %s\n"
+                  shell-file-name
+                  doom-env-switches
+                  doom-env-executable)
           "#\n"
           "# It contains all environment variables scraped from your default shell\n"
           "# (excluding variables blacklisted in doom-env-ignored-vars).\n"
@@ -109,13 +106,12 @@ order of `doom-env-switches' determines priority."
           "# To auto-regenerate this file when `doom reload` is run, use `doom env auto'\n"
           "# or set DOOMENV=1 in your shell environment/config.\n"
           "# ---------------------------------------------------------------------------\n\n"))
-        (let ((env-point (point)))
-          ;; temporarily unset ignored environment variables
-          (dolist (var doom-env-ignored-vars)
-            (setenv var nil))
-          (dolist (shell-command-switch doom-env-switches)
-            (message "Scraping env from '%s %s %s'"
-                     shell-file-name
-                     shell-command-switch
-                     doom-env-executable)
-            (insert (shell-command-to-string doom-env-executable))))))))
+        ;; temporarily unset ignored environment variables
+        (dolist (var doom-env-ignored-vars)
+          (setenv var nil))
+        (let ((shell-command-switch doom-env-switches))
+          (message "Scraping env from '%s %s %s'"
+                   shell-file-name
+                   shell-command-switch
+                   doom-env-executable)
+          (insert (shell-command-to-string doom-env-executable)))))))