diff --git a/_modpacks/resources/cswt/cstppycsmm.py b/_modpacks/resources/cswt/cstppycsmm.py
index 2b84e202e..4b5ed6bae 100644
--- a/_modpacks/resources/cswt/cstppycsmm.py
+++ b/_modpacks/resources/cswt/cstppycsmm.py
@@ -155,6 +155,9 @@ def saveFiles(self, root, gameInstance, modList):
 			mainDol.write(b'\x38\x60\x00\x01')
 			mainDol.seek(mapper.boomToFileAddress(0x8020f91c))
 			mainDol.write(b'\x38\x60\x00\x01')
+			# fix shop loop bug
+			mainDol.seek(mapper.boomToFileAddress(0x8008f538))
+			mainDol.write(b'\x60\x00\x00\x00')
 
 	def saveUiMessages(self):
 		return {f'files/localize/ui_message.{k}.csv':
diff --git a/_modpacks/resources/cswt/cswtpycsmm.py b/_modpacks/resources/cswt/cswtpycsmm.py
index cf5fc7c2f..33cb86adc 100644
--- a/_modpacks/resources/cswt/cswtpycsmm.py
+++ b/_modpacks/resources/cswt/cswtpycsmm.py
@@ -155,12 +155,15 @@ def saveFiles(self, root, gameInstance, modList):
 			mainDol.write(b'\x38\x60\x00\x01')
 			mainDol.seek(mapper.boomToFileAddress(0x8020f91c))
 			mainDol.write(b'\x38\x60\x00\x01')
-			
+			# fix shop loop bug
+			mainDol.seek(mapper.boomToFileAddress(0x8008f538))
+			mainDol.write(b'\x60\x00\x00\x00')
+
 	def saveUiMessages(self):
 		return {f'files/localize/ui_message.{k}.csv':
 			(lambda root, gameInstance, modList, msgDict, toReplaceWith=v: replUiMessages(msgDict, UI_MSGS_ALL | toReplaceWith))
 			for k,v in UI_MSGS.items()}
-	
+
 	def modifyArcFile(self):
 		localeToTitleArcFile = {
 			'ja': 'files/game/game_sequence_title.arc',