diff --git a/desmume/src/cocoa/cocoa_core.mm b/desmume/src/cocoa/cocoa_core.mm
index ea6b481d2..77d02a90f 100644
--- a/desmume/src/cocoa/cocoa_core.mm
+++ b/desmume/src/cocoa/cocoa_core.mm
@@ -550,11 +550,13 @@ volatile bool execute = true;
 	{
 		self.emuFlagUseExternalFirmware = YES;
 		CommonSettings.UseExtFirmware = true;
+		CommonSettings.UseExtFirmwareSettings = true;
 	}
 	else
 	{
 		self.emuFlagUseExternalFirmware = NO;
 		CommonSettings.UseExtFirmware = false;
+		CommonSettings.UseExtFirmwareSettings = false;
 	}
 	
 	if (theFlags & EMULATION_BOOT_FROM_FIRMWARE_MASK)
diff --git a/desmume/src/firmware.cpp b/desmume/src/firmware.cpp
index 711a840c3..cf480ec97 100644
--- a/desmume/src/firmware.cpp
+++ b/desmume/src/firmware.cpp
@@ -250,7 +250,7 @@ bool CFIRMWARE::load()
 	u32 size = 0;
 	u8	*data = NULL;
 	
-	if (CommonSettings.UseExtFirmware == false)
+	if (!CommonSettings.UseExtFirmware)
 		return false;
 	if (strlen(CommonSettings.Firmware) == 0)
 		return false;
diff --git a/desmume/src/movie.cpp b/desmume/src/movie.cpp
index cea765be0..bad40a5a3 100644
--- a/desmume/src/movie.cpp
+++ b/desmume/src/movie.cpp
@@ -559,7 +559,7 @@ const char* _CDECL_ FCEUI_LoadMovie(const char *fname, bool _read_only, bool tas
 	//poweron(true);
 
 	// reset firmware (some games can write to it)
-	if (CommonSettings.UseExtFirmware == false)
+	if (!CommonSettings.UseExtFirmware)
 	{
 		NDS_CreateDummyFirmware(&CommonSettings.fw_config);
 	}
@@ -674,7 +674,7 @@ void FCEUI_SaveMovie(const char *fname, std::wstring author, int flag, std::stri
 	currMovieData.rtcStart = rtcstart;
 
 	// reset firmware (some games can write to it)
-	if (CommonSettings.UseExtFirmware == false)
+	if (!CommonSettings.UseExtFirmware)
 	{
 		NDS_CreateDummyFirmware(&CommonSettings.fw_config);
 	}