diff --git a/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsole.c b/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsole.c
index a0983baf69..bdcc19e41a 100644
--- a/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsole.c
+++ b/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsole.c
@@ -288,7 +288,7 @@ GraphicsConsoleControllerDriverStart (
     goto Error;
   }
 
-  NarrowFontSize  = ReturnNarrowFontSize ();
+  NarrowFontSize  = mNarrowFontSize;
 
   if (mFirstAccessFlag) {
     //
diff --git a/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsole.h b/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsole.h
index 6306a2b7bb..dc516f4f64 100644
--- a/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsole.h
+++ b/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsole.h
@@ -41,7 +41,7 @@ extern EFI_COMPONENT_NAME2_PROTOCOL  gGraphicsConsoleComponentName2;
 extern EFI_DRIVER_BINDING_PROTOCOL   gGraphicsConsoleDriverBinding;
 extern EFI_NARROW_GLYPH              gUsStdNarrowGlyphData[];
 
-
+extern UINT32 mNarrowFontSize;
 //
 // User can define valid graphic resolution here
 // e.g. 640x480, 800x600, 1024x768...
@@ -216,19 +216,6 @@ GraphicsConsoleComponentNameGetControllerName (
   );
 
 
-
-
-/**
-  Returns available Unicode glyphs narrow fonts(8*19 pixels) size.
-
-  @return Narrow font size.
-
-**/
-UINT32
-ReturnNarrowFontSize (
-  VOID
-  );
-
 /**
   Reset the text output device hardware and optionally run diagnostics.
   
diff --git a/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/LaffStd.c b/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/LaffStd.c
index 786cd9aeaf..0d029aaa03 100644
--- a/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/LaffStd.c
+++ b/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/LaffStd.c
@@ -14,6 +14,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 
 #include "GraphicsConsole.h"
 
+
+
 EFI_NARROW_GLYPH  gUsStdNarrowGlyphData[] = {
   //
   // Unicode glyphs from 0x20 to 0x7e are the same as ASCII characters 0x20 to 0x7e
@@ -270,19 +272,6 @@ EFI_NARROW_GLYPH  gUsStdNarrowGlyphData[] = {
   { 0x0000, 0x00, {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}} //EOL
 };
 
-/**
-  Returns available Unicode glyphs narrow fonts(8*19 pixels) size.
+// Get available Unicode glyphs narrow fonts(8*19 pixels) size.
+UINT32 mNarrowFontSize =  sizeof (gUsStdNarrowGlyphData);
 
-  @return Narrow font size.
-
-**/
-UINT32
-ReturnNarrowFontSize (
-  VOID
-  )
-{
-  //
-  // I need the size of this outside of this file, so here is a stub function to do that for me
-  //
-  return sizeof (gUsStdNarrowGlyphData);
-}