diff --git a/functions.sh b/functions.sh
index f9d56138..99c2d9f2 100644
--- a/functions.sh
+++ b/functions.sh
@@ -1762,9 +1762,14 @@ prepare_emulator() {
         cp -fv "$emuconfigs/ppssppsdl/"* /var/config/ppsspp/PSP/SYSTEM/
         set_setting_value "$ppssppconf" "CurrentDirectory" "$roms_folder/psp" "ppsspp" "General"
       fi
+      # Shared actions
+      dir_prep "$saves_folder/PSP/PPSSPP-SA" "/var/config/ppsspp/PSP/SAVEDATA"
+      dir_prep "$states_folder/PSP/PPSSPP-SA" "/var/config/ppsspp/PSP/PPSSPP_STATE"
     fi
     if [[ "$action" == "postmove" ]]; then # Run only post-move commands
       set_setting_value "$ppssppconf" "CurrentDirectory" "$roms_folder/psp" "ppsspp" "General"
+      dir_prep "$saves_folder/PSP/PPSSPP-SA" "/var/config/ppsspp/PSP/SAVEDATA"
+      dir_prep "$states_folder/PSP/PPSSPP-SA" "/var/config/ppsspp/PSP/PPSSPP_STATE"
     fi
   fi
   
diff --git a/post_update.sh b/post_update.sh
index dc038419..2738c929 100644
--- a/post_update.sh
+++ b/post_update.sh
@@ -78,6 +78,7 @@ post_update() {
     # - Move Duckstation saves and states to new locations
     # - Clean up legacy tools files (Configurator is now accessible through the main ES-DE menu)
     # - Move Dolphin and Primehack save folder names
+    # - Move PPSSPP saves/states to appropriate folders
 
     update_rd_conf # Expand retrodeck.cfg to latest template
     set_setting_value $rd_conf "screenshots_folder" "$rdhome/screenshots"
@@ -163,6 +164,9 @@ post_update() {
     dir_prep "$saves_folder/gc/primehack/EU" "/var/data/primehack/GC/EUR"
     dir_prep "$saves_folder/gc/primehack/US" "/var/data/primehack/GC/USA"
     dir_prep "$saves_folder/gc/primehack/JP" "/var/data/primehack/GC/JAP"
+
+    dir_prep "$saves_folder/PSP/PPSSPP-SA" "/var/config/ppsspp/PSP/SAVEDATA"
+    dir_prep "$states_folder/PSP/PPSSPP-SA" "/var/config/ppsspp/PSP/PPSSPP_STATE"
   fi
 
   # The following commands are run every time.