diff --git a/es-app/assets/Windows_Portable_README.txt b/es-app/assets/Windows_Portable_README.txt
index 16ea8b83d..8e2f559ab 100644
--- a/es-app/assets/Windows_Portable_README.txt
+++ b/es-app/assets/Windows_Portable_README.txt
@@ -42,6 +42,7 @@ Preconfigured emulator locations:
 Emulators\RetroArch-Win64\retroarch.exe
 Emulators\RetroArch\retroarch.exe
 Emulators\3dSen\3dSen.exe
+Emulators\a7800\a7800.exe
 Emulators\AceDL\AceDL.exe
 Emulators\AdvanceMAME\advmame.exe
 Emulators\Altirra\Altirra64.exe
diff --git a/resources/systems/linux/es_find_rules.xml b/resources/systems/linux/es_find_rules.xml
index 416997a11..5db296888 100644
--- a/resources/systems/linux/es_find_rules.xml
+++ b/resources/systems/linux/es_find_rules.xml
@@ -52,6 +52,15 @@
             <entry>~/bin/3dSen/3dSen.exe</entry>
         </rule>
     </emulator>
+    <emulator name="A7800">
+        <!-- Atari 7800 emulator A7800 -->
+        <rule type="staticpath">
+            <entry>~/Applications/a7800-linux/a7800</entry>
+            <entry>~/.local/share/applications/a7800-linux/a7800</entry>
+            <entry>~/.local/bin/a7800-linux/a7800</entry>
+            <entry>~/bin/a7800-linux/a7800</entry>
+        </rule>
+    </emulator>
     <emulator name="ACE-DL">
         <!-- Amstrad CPC emulator ACE-DL -->
         <rule type="systempath">
diff --git a/resources/systems/linux/es_systems.xml b/resources/systems/linux/es_systems.xml
index 676f2b916..b2a6f2066 100644
--- a/resources/systems/linux/es_systems.xml
+++ b/resources/systems/linux/es_systems.xml
@@ -242,6 +242,7 @@
         <command label="ProSystem">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/prosystem_libretro.so %ROM%</command>
         <command label="MAME - Current">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mame_libretro.so "a7800 -rompath \"%GAMEDIRRAW%;%ROMPATH%/atari7800\" -cart \"%ROMRAW%\""</command>
         <command label="MAME (Standalone)">%STARTDIR%=~/.mame %EMULATOR_MAME% -rompath %GAMEDIR%\;%ROMPATH%/atari7800 a7800 -cart %ROM%</command>
+        <command label="A7800 (Standalone)">%STARTDIR%=%EMUDIR% %EMULATOR_A7800% -rompath %GAMEDIR%\;%ROMPATH%/atari7800 a7800 -cart %ROM%</command>
         <platform>atari7800</platform>
         <theme>atari7800</theme>
     </system>
diff --git a/resources/systems/windows/es_find_rules.xml b/resources/systems/windows/es_find_rules.xml
index 69197d36e..15f0095b2 100644
--- a/resources/systems/windows/es_find_rules.xml
+++ b/resources/systems/windows/es_find_rules.xml
@@ -52,6 +52,16 @@
             <entry>%ESPATH%\..\Emulators\3dSen\3dSen.exe</entry>
         </rule>
     </emulator>
+    <emulator name="A7800">
+        <!-- Atari 7800 emulator A7800 -->
+        <rule type="systempath">
+            <entry>a7800.exe</entry>
+        </rule>
+        <rule type="staticpath">
+            <entry>%ESPATH%\Emulators\a7800\a7800.exe</entry>
+            <entry>%ESPATH%\..\Emulators\a7800\a7800.exe</entry>
+        </rule>
+    </emulator>
     <emulator name="ACE-DL">
         <!-- Amstrad CPC emulator ACE-DL -->
         <rule type="systempath">
diff --git a/resources/systems/windows/es_find_rules_portable.xml b/resources/systems/windows/es_find_rules_portable.xml
index 2973bdd07..0c9bcfecf 100644
--- a/resources/systems/windows/es_find_rules_portable.xml
+++ b/resources/systems/windows/es_find_rules_portable.xml
@@ -28,6 +28,13 @@
             <entry>%ESPATH%\..\Emulators\3dSen\3dSen.exe</entry>
         </rule>
     </emulator>
+    <emulator name="A7800">
+        <!-- Atari 7800 emulator A7800 -->
+        <rule type="staticpath">
+            <entry>%ESPATH%\Emulators\a7800\a7800.exe</entry>
+            <entry>%ESPATH%\..\Emulators\a7800\a7800.exe</entry>
+        </rule>
+    </emulator>
     <emulator name="ACE-DL">
         <!-- Amstrad CPC emulator ACE-DL -->
         <rule type="staticpath">
diff --git a/resources/systems/windows/es_systems.xml b/resources/systems/windows/es_systems.xml
index d0f3d5e87..291e39300 100644
--- a/resources/systems/windows/es_systems.xml
+++ b/resources/systems/windows/es_systems.xml
@@ -242,6 +242,7 @@
         <command label="ProSystem">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\prosystem_libretro.dll %ROM%</command>
         <command label="MAME - Current">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\mame_libretro.dll "a7800 -rompath \"%GAMEDIRRAW%;%ROMPATH%\atari7800\" -cart \"%ROMRAW%\""</command>
         <command label="MAME (Standalone)">%HIDEWINDOW% %STARTDIR%=%EMUDIR% %EMULATOR_MAME% -rompath %GAMEDIR%\;%ROMPATH%\atari7800 a7800 -cart %ROM%</command>
+        <command label="A7800 (Standalone)">%STARTDIR%=%EMUDIR% %EMULATOR_A7800% -rompath %GAMEDIR%\;%ROMPATH%\atari7800 a7800 -cart %ROM%</command>
         <platform>atari7800</platform>
         <theme>atari7800</theme>
     </system>