diff --git a/resources/systems/unix/es_find_rules.xml b/resources/systems/unix/es_find_rules.xml
index 66adfa602..79e8ca6d8 100644
--- a/resources/systems/unix/es_find_rules.xml
+++ b/resources/systems/unix/es_find_rules.xml
@@ -168,7 +168,6 @@
             <entry>rpcs3</entry>
             <entry>rpcs3-emu.rpcs3</entry>
             <entry>net.rpcs3.RPCS3</entry>
-            <entry>rpcs3.AppImage</entry>
         </rule>
         <rule type="staticpath">
             <entry>/var/lib/flatpak/exports/bin/net.rpcs3.RPCS3</entry>
@@ -177,6 +176,16 @@
             <entry>~/bin/rpcs3*.AppImage</entry>
         </rule>
     </emulator>
+    <emulator name="RYUJINX">
+        <!-- Nintendo Switch emulator Ryujinx -->
+        <rule type="systempath">
+            <entry>Ryujinx</entry>
+            <entry>org.ryujinx.Ryujinx</entry>
+        </rule>
+        <rule type="staticpath">
+            <entry>/var/lib/flatpak/exports/bin/org.ryujinx.Ryujinx</entry>
+        </rule>
+    </emulator>
     <emulator name="VBA-M">
         <!-- Nintendo Game Boy Advance emulator VBA-M -->
         <rule type="systempath">
@@ -201,7 +210,6 @@
         <rule type="systempath">
             <entry>yuzu</entry>
             <entry>org.yuzu_emu.yuzu</entry>
-            <entry>yuzu.AppImage</entry>
         </rule>
         <rule type="staticpath">
             <entry>/var/lib/flatpak/exports/bin/org.yuzu_emu.yuzu</entry>
diff --git a/resources/systems/unix/es_systems.xml b/resources/systems/unix/es_systems.xml
index edeef16eb..a9822623a 100644
--- a/resources/systems/unix/es_systems.xml
+++ b/resources/systems/unix/es_systems.xml
@@ -1198,7 +1198,8 @@
         <fullname>Nintendo Switch</fullname>
         <path>%ROMPATH%/switch</path>
         <extension>.nca .NCA .nro .NRO .nso .NSO .nsp .NSP .xci .XCI .7z .7Z .zip .ZIP</extension>
-        <command label="Yuzu (Standalone)">%EMULATOR_YUZU% %ROM%</command>
+        <command label="Yuzu (Standalone)">%EMULATOR_YUZU% -f -g %ROM%</command>
+        <command label="Ryujinx (Standalone)">%EMULATOR_RYUJINX% %ROM%</command>
         <platform>switch</platform>
         <theme>switch</theme>
     </system>
diff --git a/resources/systems/windows/es_find_rules.xml b/resources/systems/windows/es_find_rules.xml
index b2138ca0d..2416bdccd 100644
--- a/resources/systems/windows/es_find_rules.xml
+++ b/resources/systems/windows/es_find_rules.xml
@@ -196,6 +196,16 @@
             <entry>%ESPATH%\..\RPCS3\rpcs3.exe</entry>
         </rule>
     </emulator>
+    <emulator name="RYUJINX">
+        <!-- Nintendo Switch emulator Ryujinx -->
+        <rule type="systempath">
+            <entry>Ryujinx.exe</entry>
+        </rule>
+        <rule type="staticpath">
+            <entry>%ESPATH%\ryujinx\Ryujinx.exe</entry>
+            <entry>%ESPATH%\..\ryujinx\Ryujinx.exe</entry>
+        </rule>
+    </emulator>
     <emulator name="VBA-M">
         <!-- Nintendo Game Boy Advance emulator VBA-M -->
         <rule type="systempath">
diff --git a/resources/systems/windows/es_systems.xml b/resources/systems/windows/es_systems.xml
index 598707988..f983579fc 100644
--- a/resources/systems/windows/es_systems.xml
+++ b/resources/systems/windows/es_systems.xml
@@ -1198,7 +1198,8 @@
         <fullname>Nintendo Switch</fullname>
         <path>%ROMPATH%\switch</path>
         <extension>.nca .NCA .nro .NRO .nso .NSO .nsp .NSP .xci .XCI .7z .7Z .zip .ZIP</extension>
-        <command label="Yuzu (Standalone)">%EMULATOR_YUZU% %ROM%</command>
+        <command label="Yuzu (Standalone)">%EMULATOR_YUZU% -f -g %ROM%</command>
+        <command label="Ryujinx (Standalone)">%EMULATOR_RYUJINX% %ROM%</command>
         <platform>switch</platform>
         <theme>switch</theme>
     </system>