diff --git a/functions/global.sh b/functions/global.sh
index 6f1fd0be..cabfb66f 100644
--- a/functions/global.sh
+++ b/functions/global.sh
@@ -49,7 +49,7 @@ pretty_system_names_reference_list="$emuconfigs/defaults/retrodeck/reference_lis
 
 # Godot data transfer temp files
 
-godot_bios_files_checked="var/config/retrodeck/godot_bios_files_checked.tmp"
+godot_bios_files_checked="var/config/retrodeck/godot/godot_bios_files_checked.tmp"
 
 # Config files for emulators with single config files
 
diff --git a/functions/prepare_component.sh b/functions/prepare_component.sh
index 1ad5e035..b367217b 100644
--- a/functions/prepare_component.sh
+++ b/functions/prepare_component.sh
@@ -23,6 +23,7 @@ prepare_component() {
           mkdir -p "$rdhome/$(basename $current_setting_value)"
         fi
       done < <(grep -v '^\s*$' $rd_conf | awk '/^\[paths\]/{f=1;next} /^\[/{f=0} f')
+      mkdir -p "/var/config/retrodeck/godot"
     fi
     if [[ "$action" == "postmove" ]]; then # Update the paths of any folders that came with the retrodeck folder during a move
       while read -r config_line; do