diff --git a/C++ProjectTemplate b/C++ProjectTemplate
index bd71d9a..d413ea6 100755
Binary files a/C++ProjectTemplate and b/C++ProjectTemplate differ
diff --git a/main.cpp b/main.cpp
index 8cebcb3..1934e1b 100644
--- a/main.cpp
+++ b/main.cpp
@@ -1013,7 +1013,7 @@ This is a test message that lets us trigger straight from a cutscene! Cool!)"),
 				if (GetKey(F5).bPressed) {
 					GAME_STATE=GameState::EDITOR;
 				} else
-				if (ACTIONKEYPRESSED) {
+				if (PlayerCanMove()&&ACTIONKEYPRESSED) {
 					GAME_STATE=GameState::OVERWORLD_MENU;
 					OVERWORLD_MENU_SELECTION=0;
 				}
@@ -2394,7 +2394,7 @@ This is a test message that lets us trigger straight from a cutscene! Cool!)"),
 	}
 
 	bool PlayerCanMove(){
-		return BATTLE_ENCOUNTER==nullptr&&!IsTextEntryEnabled()&&!messageBoxVisible&&PARTY_MEMBER_OBJ[0]!=nullptr;
+		return GAME_STATE==GameState::GAME_WORLD&&BATTLE_ENCOUNTER==nullptr&&!IsTextEntryEnabled()&&!messageBoxVisible&&PARTY_MEMBER_OBJ[0]!=nullptr&&CurrentCutscene==nullptr;
 	}
 
 	void DisplayMessageBox(std::string targetText) {