diff --git a/emu-configs/ryujinx/ryujinx-rdwrapper.sh b/emu-configs/ryujinx/ryujinx-rdwrapper.sh
new file mode 100755
index 00000000..ed7eae57
--- /dev/null
+++ b/emu-configs/ryujinx/ryujinx-rdwrapper.sh
@@ -0,0 +1,4 @@
+#!/bin/bash
+
+manage_ryujinx_keys
+Ryujinx.sh
\ No newline at end of file
diff --git a/es-configs/es_find_rules.xml b/es-configs/es_find_rules.xml
index 165086b4..3c5017a8 100644
--- a/es-configs/es_find_rules.xml
+++ b/es-configs/es_find_rules.xml
@@ -742,7 +742,7 @@
     <emulator name="RYUJINX">
         <!-- Nintendo Switch emulator Ryujinx -->
         <rule type="systempath">
-	    <entry>Ryujinx.sh</entry> <!-- RetroDECK -->
+	    <entry>ryujinx-rdwrapper.sh</entry> <!-- RetroDECK -->
             <entry>Ryujinx</entry>
             <entry>Ryujinx.Ava</entry>
             <entry>org.ryujinx.Ryujinx</entry>
diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml
index ec4e4964..e6297f11 100644
--- a/net.retrodeck.retrodeck.yml
+++ b/net.retrodeck.retrodeck.yml
@@ -1375,6 +1375,10 @@ modules:
       - cp emu-configs/mame/mame-rdwrapper.sh ${FLATPAK_DEST}/bin/mame-rdwrapper.sh
       - chmod +x ${FLATPAK_DEST}/bin/mame-rdwrapper.sh
 
+      # Ryujinx wrapper
+      - cp emu-configs/ryujinx/ryujinx-rdwrapper.sh ${FLATPAK_DEST}/bin/ryujinx-rdwrapper.sh
+      - chmod +x ${FLATPAK_DEST}/bin/ryujinx-rdwrapper.sh
+
     sources:
       - type: git
         url: https://github.com/XargonWan/RetroDECK.git
diff --git a/retrodeck.sh b/retrodeck.sh
index f7edcf7c..c8033072 100644
--- a/retrodeck.sh
+++ b/retrodeck.sh
@@ -182,9 +182,6 @@ if [[ -f "$HOME/.steam/steam/controller_base/templates/RetroDECK_controller_conf
 fi
 # REMOVE BEFORE NEXT VERSION RELEASE
 
-# Linking switch keys for Ryujinx
-manage_ryujinx_keys
-
 # Normal Startup
 
 if [[ $steam_sync == "true" ]]; then
diff --git a/tools/configurator.sh b/tools/configurator.sh
index 2b1686b9..96846329 100644
--- a/tools/configurator.sh
+++ b/tools/configurator.sh
@@ -510,7 +510,7 @@ configurator_open_emulator_dialog() {
 
   "Ryujinx" )
     log i "Configurator: \"$emulator\""
-    Ryujinx.sh
+    ryujinx-rdwrapper.sh
   ;;
 
   "Vita3K" )