diff --git a/source/Enderal DLL/src/EventListener.cpp b/source/Enderal DLL/src/EventListener.cpp
index feb09472..5ca31a7a 100644
--- a/source/Enderal DLL/src/EventListener.cpp	
+++ b/source/Enderal DLL/src/EventListener.cpp	
@@ -50,7 +50,7 @@ auto EventListener::ProcessEvent(
 			DialogueMenuPatch::BlockTab(false);
 		} else if (a_event->menuName == "CustomMenu") {
 			auto uiMovie = RE::UI::GetSingleton()->GetMovieView("CustomMenu");
-			if (uiMovie && std::strstr(uiMovie->GetMovieDef()->GetFileURL(), "00e_heromenu.swf") != NULL) {
+			if (uiMovie && std::strstr(uiMovie->GetMovieDef()->GetFileURL(), "_heromenu.swf") != NULL) {
 				if (RE::UI::GetSingleton()->IsMenuOpen(RE::TweenMenu::MENU_NAME)) {
 					CloseTweenMenu();
 				}
diff --git a/source/Enderal DLL/src/Patches/DialogueMenuPatch.h b/source/Enderal DLL/src/Patches/DialogueMenuPatch.h
index 6b10257e..970f25f3 100644
--- a/source/Enderal DLL/src/Patches/DialogueMenuPatch.h	
+++ b/source/Enderal DLL/src/Patches/DialogueMenuPatch.h	
@@ -30,7 +30,8 @@ private:
 					// Escape triggers a kTab event, added kEscape just in case
 					&& (key->keyCode == RE::GFxKey::kTab || key->keyCode == RE::GFxKey::kEscape)
 					// Covers inventory and barter
-					&& !RE::UI::GetSingleton()->GameIsPaused()) {
+					&& !RE::UI::GetSingleton()->GameIsPaused()
+					&& RE::UI::GetSingleton()->IsMenuOpen(MENU_NAME)) {
 					OpenJournal(false);
 					return RE::UI_MESSAGE_RESULTS::kIgnore;
 				}
diff --git a/source/Enderal DLL/src/Patches/HeroMenuPatch.cpp b/source/Enderal DLL/src/Patches/HeroMenuPatch.cpp
index 00428ec7..873a46b7 100644
--- a/source/Enderal DLL/src/Patches/HeroMenuPatch.cpp	
+++ b/source/Enderal DLL/src/Patches/HeroMenuPatch.cpp	
@@ -11,7 +11,7 @@ RE::BSEventNotifyControl HeroMenuPatch::ProcessEvent_Hook(RE::InputEvent** a_eve
 
 			if (eventName == userEvents->cancel || eventName == userEvents->quickStats) {
 				auto uiMovie = RE::UI::GetSingleton()->GetMovieView("CustomMenu");
-				if (uiMovie && std::strstr(uiMovie->GetMovieDef()->GetFileURL(), "00e_heromenu.swf") != NULL) {
+				if (uiMovie && std::strstr(uiMovie->GetMovieDef()->GetFileURL(), "_heromenu.swf") != NULL) {
 					RE::UIMessageQueue::GetSingleton()->AddMessage("CustomMenu", RE::UI_MESSAGE_TYPE::kHide, nullptr);
 				}
 			}