diff --git a/resources/systems/android/es_find_rules.xml b/resources/systems/android/es_find_rules.xml
index b8572bd50..928f8328f 100644
--- a/resources/systems/android/es_find_rules.xml
+++ b/resources/systems/android/es_find_rules.xml
@@ -21,6 +21,12 @@
             <entry>org.citra.citra_emu/.ui.main.MainActivity</entry>
         </rule>
     </emulator>
+    <emulator name="CITRA-CANARY">
+        <!-- Nintendo 3DS emulator Citra Canary -->
+        <rule type="androidpackage">
+            <entry>org.citra.citra_emu.canary/org.citra.citra_emu.activities.EmulationActivity</entry>
+        </rule>
+    </emulator>
     <emulator name="CITRA-MMJ">
         <!-- Nintendo 3DS emulator Citra MMJ -->
         <rule type="androidpackage">
diff --git a/resources/systems/android/es_systems.xml b/resources/systems/android/es_systems.xml
index 2e421b7c5..2f0873d94 100644
--- a/resources/systems/android/es_systems.xml
+++ b/resources/systems/android/es_systems.xml
@@ -984,7 +984,8 @@
         <path>%ROMPATH%/n3ds</path>
         <extension>.3ds .3DS .3dsx .3DSX .app .APP .axf .AXF .cci .CCI .cxi .CXI .elf .ELF .7z .7Z .zip .ZIP</extension>
         <command label="Citra">%EMULATOR_RETROARCH% %EXTRA_CONFIGFILE%=/storage/emulated/0/Android/data/%ANDROIDPACKAGE%/files/retroarch.cfg %EXTRA_LIBRETRO%=/data/data/%ANDROIDPACKAGE%/cores/citra_libretro_android.so %EXTRA_ROM%=%ROM%</command>
-        <command label="Citra (Standalone)">%EMULATOR_CITRA% %EXTRA_SelectedGame%=%ROMSAF%</command>
+        <command label="Citra (Standalone)">%EMULATOR_CITRA% %DATA%=%ROMSAF%</command>
+        <command label="Citra Canary (Standalone)">%EMULATOR_CITRA-CANARY% %DATA%=%ROMSAF%</command>
         <command label="Citra MMJ (Standalone)">%EMULATOR_CITRA-MMJ% %EXTRA_GamePath%=%ROM%</command>
         <platform>n3ds</platform>
         <theme>n3ds</theme>