diff --git a/functions.sh b/functions.sh
index ec63d828..a518fc66 100644
--- a/functions.sh
+++ b/functions.sh
@@ -1716,6 +1716,11 @@ easter_eggs() {
   cp -fv "$new_splash_file" "$current_splash_file" # Deploy assigned splash screen
 }
 
+tools_init() {
+  mkdir -pv /var/config/emulationstation/.emulationstation/gamelists/tools/
+  cp -fv /app/retrodeck/tools-gamelist.xml /var/config/emulationstation/.emulationstation/gamelists/tools/gamelist.xml
+}
+
 start_retrodeck() {
   echo "Checking to see if today has a surprise..."
   easter_eggs
diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml
index 390f4652..c93cc82d 100644
--- a/net.retrodeck.retrodeck.yml
+++ b/net.retrodeck.retrodeck.yml
@@ -77,7 +77,7 @@ modules:
     buildsystem: simple
     build-commands:
       - |
-      
+
         VERSION="0.6.5b"
 
         git checkout ${GITHUB_REF_NAME}
@@ -1080,7 +1080,7 @@ modules:
       - mkdir -p /app/tools
       - cp tools/configurator.sh /app/tools/configurator.sh
       - chmod +x /app/tools/configurator.sh
-      - cp es-configs/tools-gamelist.xml /app/tools/gamelist.xml
+      - cp es-configs/tools-gamelist.xml /app/retrodeck/tools-gamelist.xml
 
       # Function libraries
       - mkdir -p /app/libexec
diff --git a/post_update.sh b/post_update.sh
index e6dc455c..82857bdb 100644
--- a/post_update.sh
+++ b/post_update.sh
@@ -36,7 +36,7 @@ post_update() {
     # - Put Dolphin and Primehack save states in different folders inside $rd_home/states
     # - Fix symlink to hard-coded PICO-8 config folder (dir_prep doesn't like ~)
     # - Overwrite Citra and Yuzu configs, as controller mapping was broken due to emulator updates.
-    
+
     dir_prep "$rdhome/states/dolphin" "/var/data/dolphin-emu/StateSaves"
     dir_prep "$rdhome/states/primehack" "/var/data/primehack/StateSaves"
 
@@ -95,6 +95,7 @@ post_update() {
 
   # The following commands are run every time.
 
+  tools_init
   update_splashscreens
   update_rd_conf
   ) |