diff --git a/emu-configs/mame/cfg/default.cfg b/emu-configs/mame/default.cfg
similarity index 100%
rename from emu-configs/mame/cfg/default.cfg
rename to emu-configs/mame/default.cfg
diff --git a/emu-configs/mame/mame-rdwrapper.sh b/emu-configs/mame/mame-rdwrapper.sh
new file mode 100755
index 00000000..e6c98fcd
--- /dev/null
+++ b/emu-configs/mame/mame-rdwrapper.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+mame -inipath /var/config/mame
\ No newline at end of file
diff --git a/es-configs/es_find_rules.xml b/es-configs/es_find_rules.xml
index 112a4a40..165086b4 100644
--- a/es-configs/es_find_rules.xml
+++ b/es-configs/es_find_rules.xml
@@ -463,7 +463,7 @@
     <emulator name="MAME">
         <!-- Arcade emulator MAME -->
         <rule type="systempath">
-            <entry>mame</entry>
+            <entry>mame-rdwrapper.sh</entry>
             <entry>org.mamedev.MAME</entry>
         </rule>
         <rule type="staticpath">
diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml
index b7ab4bb8..d1efc458 100644
--- a/net.retrodeck.retrodeck.yml
+++ b/net.retrodeck.retrodeck.yml
@@ -1358,6 +1358,10 @@ modules:
       - cp emu-configs/gzdoom/gzdoom.sh ${FLATPAK_DEST}/bin/gzdoom.sh
       - chmod +x ${FLATPAK_DEST}/bin/gzdoom.sh
 
+      # MAME wrapper
+      - cp emu-configs/mame/mame-rdwrapper.sh ${FLATPAK_DEST}/bin/mame-rdwrapper.sh
+      - chmod +x ${FLATPAK_DEST}/bin/mame-rdwrapper.sh
+
     sources:
       - type: git
         url: https://github.com/XargonWan/RetroDECK.git
diff --git a/tools/configurator.sh b/tools/configurator.sh
index ee5509eb..6ffa3b42 100644
--- a/tools/configurator.sh
+++ b/tools/configurator.sh
@@ -476,7 +476,7 @@ configurator_open_emulator_dialog() {
   ;;
 
   "MAME" )
-    mame
+    mame-rdwrapper.sh
   ;;
 
   "MelonDS" )