diff --git a/Editor/LoadScreen.cpp b/Editor/LoadScreen.cpp
index 2e0ce9672..81a9e0248 100644
--- a/Editor/LoadScreen.cpp
+++ b/Editor/LoadScreen.cpp
@@ -562,7 +562,7 @@ void CreateFileDialog( STR16 zTitle )
 	//File list window
 	iFileDlgButtons[4] = CreateHotSpot( (iScreenWidthOffset + 179+4), (iScreenHeightOffset + 69+3), (179+4+240), (69+120+3), MSYS_PRIORITY_HIGH-1, BUTTON_NO_CALLBACK, FDlgNamesCallback);	
 	//Title button
-	iFileDlgButtons[5] = CreateTextButton(zTitle, HUGEFONT, FONT_LTKHAKI, FONT_DKKHAKI,
+	iFileDlgButtons[5] = CreateTextButton(zTitle, GetHugeFont(), FONT_LTKHAKI, FONT_DKKHAKI,
 		BUTTON_USE_DEFAULT,iScreenWidthOffset + 179, iScreenHeightOffset + 39,281,30,BUTTON_NO_TOGGLE,
 		MSYS_PRIORITY_HIGH-2,BUTTON_NO_CALLBACK,BUTTON_NO_CALLBACK);
 	DisableButton(iFileDlgButtons[5]);
@@ -1013,7 +1013,7 @@ UINT32 ProcessFileIO()
 		case INITIATE_MAP_SAVE:	//draw save message 
 			StartFrameBufferRender( );
 			SaveFontSettings();
-			SetFont( HUGEFONT );
+			SetFont( GetHugeFont() );
 			SetFontForeground( FONT_LTKHAKI );
 			SetFontShadow( FONT_DKKHAKI );
 			SetFontBackground( 0 );
diff --git a/Editor/Sector Summary.cpp b/Editor/Sector Summary.cpp
index 3af4b992c..aa4865524 100644
--- a/Editor/Sector Summary.cpp	
+++ b/Editor/Sector Summary.cpp	
@@ -3075,11 +3075,11 @@ void ApologizeOverrideAndForceUpdateEverything()
 	//Draw it
 	DrawButton( iSummaryButton[ SUMMARY_BACKGROUND ] );
 	InvalidateRegion( 0, 0, SCREEN_WIDTH, SCREEN_HEIGHT );
-	SetFont( HUGEFONT );
+	SetFont( GetHugeFont() );
 	SetFontForeground( FONT_RED );
 	SetFontShadow( FONT_NEARBLACK );
 	swprintf( str, pApologizeOverrideAndForceUpdateEverythingText[0] );
-	mprintf( (iScreenWidthOffset + 320) - StringPixLength( str, HUGEFONT )/2, iScreenHeightOffset + 105, str );
+	mprintf( (iScreenWidthOffset + 320) - StringPixLength( str, GetHugeFont() )/2, iScreenHeightOffset + 105, str );
 	SetFont( FONT10ARIAL );
 	SetFontForeground( FONT_YELLOW );
 	swprintf( str, pApologizeOverrideAndForceUpdateEverythingText[1], gusNumberOfMapsToBeForceUpdated );
diff --git a/Utils/Font Control.cpp b/Utils/Font Control.cpp
index a419c6f17..945fe2a39 100644
--- a/Utils/Font Control.cpp	
+++ b/Utils/Font Control.cpp	
@@ -93,6 +93,14 @@ UINT16 CreateFontPaletteTables(HVOBJECT pObj );
 
 extern UINT16 gzFontName[32];
 
+auto GetHugeFont() -> INT32 {
+#if defined(JA2EDITOR) && defined(ENGLISH)
+	return gpHugeFont;
+#else
+	return gp16PointArial;
+#endif
+}
+
 BOOLEAN	InitializeFonts( )
 {
 	//INT16	zWinFontName[128]; // unused (jonathanl)
diff --git a/Utils/Font Control.h b/Utils/Font Control.h
index f0c1a6bc8..db5856cdd 100644
--- a/Utils/Font Control.h	
+++ b/Utils/Font Control.h	
@@ -89,11 +89,6 @@ extern HVOBJECT				gvoBlockFontNarrow;
 extern INT32						gp14PointHumanist;
 extern HVOBJECT				gvo14PointHumanist;
 
-#ifdef JA2EDITOR
-extern INT32						gpHugeFont;
-extern HVOBJECT				gvoHugeFont;
-#endif
-
 //extern INT32			giSubTitleWinFont;
 
 
@@ -124,12 +119,7 @@ extern BOOLEAN					gfFontsInit;
 #define					BLOCKFONTNARROW		gpBlockFontNarrow
 #define					FONT14HUMANIST		gp14PointHumanist
 
-#if defined( JA2EDITOR ) && defined( ENGLISH )
-	#define				HUGEFONT					gpHugeFont
-#else
-	#define				HUGEFONT					gp16PointArial
-#endif
-
+auto GetHugeFont() -> INT32;
 
 #define					FONT_SHADE_RED					6
 #define					FONT_SHADE_BLUE					1