diff --git a/board/recalbox/fsoverlay/etc/init.d/S12populateshare b/board/recalbox/fsoverlay/etc/init.d/S12populateshare
index d9e7330e7eca37c4734575d6ad29646c03824ad4..68ec145f8d47fd6ef8b62eb911fa88ff1db37174 100755
--- a/board/recalbox/fsoverlay/etc/init.d/S12populateshare
+++ b/board/recalbox/fsoverlay/etc/init.d/S12populateshare
@@ -214,6 +214,11 @@ if [ "$RECALBOX_VERSION" != "$SHARE_VERSION" ] ; then
         rm -f "${OUT}/roms/ports/${systemName}/.readme.placeholder"
     done
 
+    # Fix assets for SCUMMVM
+    if [ -f $OUT/bios/scummvm/extra ];then
+        rsync -a --delete --exclude MT32_PCM.ROM  --exclude MT32_CONTROL.ROM "${IN}/bios/scummvm" "${OUT}/bios"
+    fi
+
     # Not sure why but there is some .txt file in /roms/ports which should not be here and are a copy of a port - remove them
     rm -f "${OUT}/roms/ports/_leggime.txt"
     rm -f "${OUT}/roms/ports/_leiame.txt"
diff --git a/board/recalbox/fsoverlay/recalbox/share_init/system/configs/scummvm/libretro-scummvm.ini b/board/recalbox/fsoverlay/recalbox/share_init/system/configs/scummvm/libretro-scummvm.ini
index f80cd95175a2a34e4328ab71050be11179c45687..a41ed853b780a5c61d2629f2a937ccf8180a097d 100644
--- a/board/recalbox/fsoverlay/recalbox/share_init/system/configs/scummvm/libretro-scummvm.ini
+++ b/board/recalbox/fsoverlay/recalbox/share_init/system/configs/scummvm/libretro-scummvm.ini
@@ -6,7 +6,7 @@ native_mt32=false
 mt32_device=fluidsynth
 talkspeed=60
 midi_gain=100
-extrapath=/recalbox/share/bios/scummvm/extra
+extrapath=/recalbox/share/bios/scummvm
 subtitles=true
 multi_midi=false
 fullscreen=true
diff --git a/package/libretro-scummvm/libretro-scummvm.mk b/package/libretro-scummvm/libretro-scummvm.mk
index ecaa26ab7b2fcd7f5fc4eb531af6e90066fd744d..6d85b243f99577eadd27e41e4e0acfeeaab72787 100644
--- a/package/libretro-scummvm/libretro-scummvm.mk
+++ b/package/libretro-scummvm/libretro-scummvm.mk
@@ -63,9 +63,13 @@ define LIBRETRO_SCUMMVM_INSTALL_DATAFILES
 	unzip -o $(@D)/backends/platform/libretro/scummvm.zip \
 		-d $(TARGET_DIR)/recalbox/share_init/bios \
 		scummvm/extra/*
+	cp -r $(TARGET_DIR)/recalbox/share_init/bios/scummvm/extra/* $(TARGET_DIR)/recalbox/share_init/bios/scummvm/
+	rm -Rf $(TARGET_DIR)/recalbox/share_init/bios/scummvm/extra
 	unzip -o $(@D)/backends/platform/libretro/scummvm.zip \
 		-d $(TARGET_DIR)/recalbox/share_upgrade/bios \
 		scummvm/extra/*
+	cp -r $(TARGET_DIR)/recalbox/share_upgrade/bios/scummvm/extra/* $(TARGET_DIR)/recalbox/share_init/bios/scummvm/
+	rm -Rf $(TARGET_DIR)/recalbox/share_upgrade/bios/scummvm/extra
 endef
 
 define LIBRETRO_SCUMMVM_INSTALL_THEMES
diff --git a/projects/configgen/configgen/recalboxFiles.py b/projects/configgen/configgen/recalboxFiles.py
index 6eea5d7191c7fc8b4b26e828587fc0f7f1024852..a69b9e49d1f8417e40678db047a026f80457c15a 100644
--- a/projects/configgen/configgen/recalboxFiles.py
+++ b/projects/configgen/configgen/recalboxFiles.py
@@ -126,7 +126,7 @@ dosboxConfig = dosboxCustom + '/dosbox.conf'
 
 scummvmSaves = SAVES + '/scummvm'
 libretroScummvmConfig = CONF + '/scummvm/libretro-scummvm.ini'
-libretroScummvmBios = BIOS + '/scummvm/extra'
+libretroScummvmBios = BIOS + '/scummvm'
 
 simcoupeConfig = HOME + '/.simcoupe/SimCoupe.cfg'