diff --git a/data/misc/cmd_or_ps.ps1 b/data/misc/cmd_or_ps.ps1
index b134006517..4f05967890 100644
--- a/data/misc/cmd_or_ps.ps1
+++ b/data/misc/cmd_or_ps.ps1
@@ -2,7 +2,7 @@ $i=1
 $ppid=(gwmi win32_process -Filter "processid='$pid'").parentprocessid
 $pname=(Get-Process -id $ppid).Name
 While($true) {
-  if($pname -eq "cmd" -Or $pname -eq "powershell") {
+  if($pname -eq "cmd" -Or $pname -eq "powershell" -Or $pname -eq "pwsh") {
     Write-Host ("{0}.exe" -f $pname)
     Break
   }
diff --git a/gst-env.py b/gst-env.py
index 51fb913218..862b40ec94 100755
--- a/gst-env.py
+++ b/gst-env.py
@@ -549,9 +549,8 @@ if __name__ == "__main__":
     env = get_subprocess_env(options, gst_version)
     if os.name == 'nt':
         shell = get_windows_shell()
-        if shell == 'powershell.exe':
-            new_args = ['powershell.exe']
-            new_args += ['-NoLogo']
+        if shell in ['powershell.exe', 'pwsh.exe']:
+            new_args = [shell, '-NoLogo']
             if not args:
                 prompt = 'function global:prompt {  "[gst-' + gst_version + '"+"] PS " + $PWD + "> "}'
                 new_args += ['-NoExit', '-Command', prompt]