diff --git a/resources/systems/macos/es_find_rules.xml b/resources/systems/macos/es_find_rules.xml
index 55ee43e38..03b29e094 100644
--- a/resources/systems/macos/es_find_rules.xml
+++ b/resources/systems/macos/es_find_rules.xml
@@ -1,6 +1,13 @@
 <?xml version="1.0"?>
 <!-- This is the ES-DE find rules configuration file for macOS -->
 <ruleList>
+    <emulator name="OS-SHELL">
+        <!-- Operating system shell -->
+        <rule type="systempath">
+            <entry>zsh</entry>
+            <entry>bash</entry>
+        </rule>
+    </emulator>
     <emulator name="RETROARCH">
         <rule type="staticpath">
             <entry>/Applications/RetroArch.app/Contents/MacOS/RetroArch</entry>
diff --git a/resources/systems/macos/es_systems.xml b/resources/systems/macos/es_systems.xml
index 9fb25df08..574fec8ed 100644
--- a/resources/systems/macos/es_systems.xml
+++ b/resources/systems/macos/es_systems.xml
@@ -327,7 +327,7 @@
         <fullname>Desktop Applications</fullname>
         <path>%ROMPATH%/desktop</path>
         <extension>.sh</extension>
-        <command>zsh %ROM%</command>
+        <command>%EMULATOR_OS-SHELL% %ROM%</command>
         <platform>pc</platform>
         <theme>desktop</theme>
     </system>
@@ -378,7 +378,7 @@
         <fullname>Epic Games Store</fullname>
         <path>%ROMPATH%/epic</path>
         <extension>.sh</extension>
-        <command>zsh %ROM%</command>
+        <command>%EMULATOR_OS-SHELL% %ROM%</command>
         <platform>pc</platform>
         <theme>epic</theme>
     </system>
@@ -552,7 +552,7 @@
         <fullname>Kodi Home Theatre Software</fullname>
         <path>%ROMPATH%/kodi</path>
         <extension>.sh</extension>
-        <command>zsh %ROM%</command>
+        <command>%EMULATOR_OS-SHELL% %ROM%</command>
         <platform>pc</platform>
         <theme>kodi</theme>
     </system>
@@ -960,7 +960,7 @@
         <fullname>Ports</fullname>
         <path>%ROMPATH%/ports</path>
         <extension>.sh</extension>
-        <command>zsh %ROM%</command>
+        <command>%EMULATOR_OS-SHELL% %ROM%</command>
         <platform>pc</platform>
         <theme>ports</theme>
     </system>
@@ -1195,7 +1195,7 @@
         <fullname>Valve Steam</fullname>
         <path>%ROMPATH%/steam</path>
         <extension>.sh</extension>
-        <command>%RUNINBACKGROUND% zsh %ROM%</command>
+        <command>%RUNINBACKGROUND% %EMULATOR_OS-SHELL% %ROM%</command>
         <platform>steam</platform>
         <theme>steam</theme>
     </system>
diff --git a/resources/systems/unix/es_find_rules.xml b/resources/systems/unix/es_find_rules.xml
index 22167bfe9..755e07947 100644
--- a/resources/systems/unix/es_find_rules.xml
+++ b/resources/systems/unix/es_find_rules.xml
@@ -1,6 +1,13 @@
 <?xml version="1.0"?>
 <!-- This is the ES-DE find rules configuration file for Unix -->
 <ruleList>
+    <emulator name="OS-SHELL">
+        <!-- Operating system shell -->
+        <rule type="systempath">
+            <entry>bash</entry>
+            <entry>sh</entry>
+        </rule>
+    </emulator>
     <emulator name="RETROARCH">
         <rule type="systempath">
             <entry>retroarch</entry>
diff --git a/resources/systems/unix/es_systems.xml b/resources/systems/unix/es_systems.xml
index 1c15de733..a3ae2afde 100644
--- a/resources/systems/unix/es_systems.xml
+++ b/resources/systems/unix/es_systems.xml
@@ -327,7 +327,7 @@
         <fullname>Desktop Applications</fullname>
         <path>%ROMPATH%/desktop</path>
         <extension>.sh</extension>
-        <command>bash %ROM%</command>
+        <command>%EMULATOR_OS-SHELL% %ROM%</command>
         <platform>pc</platform>
         <theme>desktop</theme>
     </system>
@@ -378,7 +378,7 @@
         <fullname>Epic Games Store</fullname>
         <path>%ROMPATH%/epic</path>
         <extension>.sh</extension>
-        <command>bash %ROM%</command>
+        <command>%EMULATOR_OS-SHELL% %ROM%</command>
         <platform>pc</platform>
         <theme>epic</theme>
     </system>
@@ -554,7 +554,7 @@
         <fullname>Kodi Home Theatre Software</fullname>
         <path>%ROMPATH%/kodi</path>
         <extension>.sh</extension>
-        <command>bash %ROM%</command>
+        <command>%EMULATOR_OS-SHELL% %ROM%</command>
         <platform>pc</platform>
         <theme>kodi</theme>
     </system>
@@ -563,7 +563,7 @@
         <fullname>Lutris Open Gaming Platform</fullname>
         <path>%ROMPATH%/lutris</path>
         <extension>.sh</extension>
-        <command>bash %ROM%</command>
+        <command>%EMULATOR_OS-SHELL% %ROM%</command>
         <platform>pc</platform>
         <theme>lutris</theme>
     </system>
@@ -965,7 +965,7 @@
         <fullname>Ports</fullname>
         <path>%ROMPATH%/ports</path>
         <extension>.sh</extension>
-        <command>bash %ROM%</command>
+        <command>%EMULATOR_OS-SHELL% %ROM%</command>
         <platform>pc</platform>
         <theme>ports</theme>
     </system>
diff --git a/resources/systems/windows/es_find_rules.xml b/resources/systems/windows/es_find_rules.xml
index 6b0425652..a14ca3264 100644
--- a/resources/systems/windows/es_find_rules.xml
+++ b/resources/systems/windows/es_find_rules.xml
@@ -1,6 +1,12 @@
 <?xml version="1.0"?>
 <!-- This is the ES-DE find rules configuration file for Windows -->
 <ruleList>
+    <emulator name="OS-SHELL">
+        <!-- Operating system shell -->
+        <rule type="systempath">
+            <entry>cmd.exe</entry>
+        </rule>
+    </emulator>
     <emulator name="RETROARCH">
         <rule type="winregistrypath">
             <!-- Check for an App Paths entry in the Windows Registry -->
diff --git a/resources/systems/windows/es_find_rules_portable.xml b/resources/systems/windows/es_find_rules_portable.xml
index 93417d33b..4058298cb 100644
--- a/resources/systems/windows/es_find_rules_portable.xml
+++ b/resources/systems/windows/es_find_rules_portable.xml
@@ -1,6 +1,12 @@
 <?xml version="1.0"?>
 <!-- This is the ES-DE find rules configuration file for Windows for portable installations -->
 <ruleList>
+    <emulator name="OS-SHELL">
+        <!-- Operating system shell -->
+        <rule type="systempath">
+            <entry>cmd.exe</entry>
+        </rule>
+    </emulator>
     <emulator name="RETROARCH">
         <rule type="staticpath">
             <!-- Portable installation -->
diff --git a/resources/systems/windows/es_systems.xml b/resources/systems/windows/es_systems.xml
index 695ee6785..621598c6b 100644
--- a/resources/systems/windows/es_systems.xml
+++ b/resources/systems/windows/es_systems.xml
@@ -327,7 +327,7 @@
         <fullname>Desktop Applications</fullname>
         <path>%ROMPATH%\desktop</path>
         <extension>.bat .BAT .lnk .LNK</extension>
-        <command>%HIDEWINDOW% %ESCAPESPECIALS% %RUNINBACKGROUND% cmd.exe /C %ROM%</command>
+        <command>%HIDEWINDOW% %ESCAPESPECIALS% %RUNINBACKGROUND% %EMULATOR_OS-SHELL% /C %ROM%</command>
         <platform>pc</platform>
         <theme>desktop</theme>
     </system>
@@ -378,7 +378,7 @@
         <fullname>Epic Games Store</fullname>
         <path>%ROMPATH%\epic</path>
         <extension>.bat .BAT</extension>
-        <command>%HIDEWINDOW% %ESCAPESPECIALS% cmd.exe /C %ROM%</command>
+        <command>%HIDEWINDOW% %ESCAPESPECIALS% %EMULATOR_OS-SHELL% /C %ROM%</command>
         <platform>pc</platform>
         <theme>epic</theme>
     </system>
@@ -552,7 +552,7 @@
         <fullname>Kodi Home Theatre Software</fullname>
         <path>%ROMPATH%\kodi</path>
         <extension>.bat .BAT .lnk .LNK</extension>
-        <command>%HIDEWINDOW% %ESCAPESPECIALS% %RUNINBACKGROUND% cmd.exe /C %ROM%</command>
+        <command>%HIDEWINDOW% %ESCAPESPECIALS% %RUNINBACKGROUND% %EMULATOR_OS-SHELL% /C %ROM%</command>
         <platform>pc</platform>
         <theme>kodi</theme>
     </system>
@@ -962,7 +962,7 @@
         <fullname>Ports</fullname>
         <path>%ROMPATH%\ports</path>
         <extension>.bat .BAT .lnk .LNK</extension>
-        <command>%HIDEWINDOW% %ESCAPESPECIALS% cmd.exe /C %ROM%</command>
+        <command>%HIDEWINDOW% %ESCAPESPECIALS% %EMULATOR_OS-SHELL% /C %ROM%</command>
         <platform>pc</platform>
         <theme>ports</theme>
     </system>
@@ -1204,7 +1204,7 @@
         <fullname>Valve Steam</fullname>
         <path>%ROMPATH%\steam</path>
         <extension>.bat .BAT .url .URL</extension>
-        <command>%HIDEWINDOW% %ESCAPESPECIALS% %RUNINBACKGROUND% cmd.exe /C %ROM%</command>
+        <command>%HIDEWINDOW% %ESCAPESPECIALS% %RUNINBACKGROUND% %EMULATOR_OS-SHELL% /C %ROM%</command>
         <platform>steam</platform>
         <theme>steam</theme>
     </system>