diff --git a/src/renderer/api/terminal-api.ts b/src/renderer/api/terminal-api.ts
index 347dfac224..b17637a800 100644
--- a/src/renderer/api/terminal-api.ts
+++ b/src/renderer/api/terminal-api.ts
@@ -119,9 +119,9 @@ export class TerminalApi extends WebSocketApi {
      * its own rc file (or RunCommands file) such as `.bashrc` or `.zshrc`.
      *
      * This heuistic assumes that the prompt line of a terminal is a single line
-     * and ends with a whitespace character.
+     * and ends with a whitespace character or the > character (windows's CMD).
      */
-    if (data.match(/\r?\n/) === null && data.match(/\s$/)) {
+    if (data.match(/\r?\n/) === null && data.match(/(\s|>)$/)) {
       this.shellRunCommandsFinished = true;
       this.onData.removeListener(this._onShellRunCommandsFinished);
     }
diff --git a/src/renderer/components/dock/terminal.store.ts b/src/renderer/components/dock/terminal.store.ts
index dd5251bac2..b99303e7ef 100644
--- a/src/renderer/components/dock/terminal.store.ts
+++ b/src/renderer/components/dock/terminal.store.ts
@@ -120,7 +120,7 @@ export class TerminalStore extends Singleton {
       const rcIsFinished = when(() => this.connections.get(tab.id).shellRunCommandsFinished);
       const notifyVeryLong = setTimeout(() => {
         rcIsFinished.cancel();
-        Notifications.info("Terminal shell is taking a long time to complete startup. Please check your .rc file. Bypassing shell completion check.", {
+        Notifications.info("Terminal shell is taking a long time to complete startup. Bypassing shell completion check.", {
           timeout: 4_000,
         });
       }, 10_000);