diff --git a/C++ProjectTemplate b/C++ProjectTemplate
index f663832..156db9d 100755
Binary files a/C++ProjectTemplate and b/C++ProjectTemplate differ
diff --git a/main.cpp b/main.cpp
index 439f250..c56d780 100644
--- a/main.cpp
+++ b/main.cpp
@@ -311,10 +311,10 @@ This is a test message that lets us trigger straight from a cutscene! Cool!)"),
 					messageBoxLoad=true;
 				} else {
 					messageBoxVisible=false;
-					if (CLOSE_OVERWORLD_WINDOW) {
+					if (CLOSE_OVERWORLD_WINDOW&&INTERACTION_MESSAGES.size()==0) {
 						GAME_STATE=GameState::GAME_WORLD;
+						CLOSE_OVERWORLD_WINDOW=false;
 					}
-					CLOSE_OVERWORLD_WINDOW=false;
 					if (HEALING_OVERWORLD_MEMBERS) {
 						if (HEALING_OVERWORLD_MEMBER==0||HEALING_OVERWORLD_MEMBER==2) {
 							DisplayMessageBox("");
@@ -379,7 +379,7 @@ This is a test message that lets us trigger straight from a cutscene! Cool!)"),
 			}
 		}
 
-		if (PlayerCanMove()&&INTERACTION_MESSAGES.size()>0) {
+		if (!messageBoxVisible&&INTERACTION_MESSAGES.size()>0) {
 			DisplayMessageBox(INTERACTION_MESSAGES.front());
 			INTERACTION_MESSAGES.erase(INTERACTION_MESSAGES.begin());
 		}