diff --git a/scripts/restore.sh b/scripts/restore.sh
index 037b891..4f949c8 100755
--- a/scripts/restore.sh
+++ b/scripts/restore.sh
@@ -258,6 +258,9 @@ restore_all_panes() {
 			restore_pane "$line"
 		fi
 	done < $(last_resurrect_file)
+	if is_restoring_pane_contents; then
+		pane_content_files_cleanup
+	fi
 }
 
 restore_pane_layout_for_each_window() {
diff --git a/scripts/save.sh b/scripts/save.sh
index 21f2b03..a58ebd4 100755
--- a/scripts/save.sh
+++ b/scripts/save.sh
@@ -269,6 +269,7 @@ save_all() {
 		mkdir -p "$(pane_contents_dir)"
 		dump_pane_contents
 		pane_contents_create_archive
+		pane_content_files_cleanup
 	fi
 	if save_bash_history_option_on; then
 		dump_bash_history