diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/FrontPage.c b/IntelFrameworkModulePkg/Universal/BdsDxe/FrontPage.c
index 97e315e771..f8a54d5c14 100644
--- a/IntelFrameworkModulePkg/Universal/BdsDxe/FrontPage.c
+++ b/IntelFrameworkModulePkg/Universal/BdsDxe/FrontPage.c
@@ -1216,6 +1216,8 @@ PlatformBdsEnterFrontPage (
     }
 
     if (SimpleTextOut != NULL) {
+      SimpleTextOut->SetMode (SimpleTextOut, 2);
+
       Status = SimpleTextOut->QueryMode (
                                 SimpleTextOut,
                                 SimpleTextOut->Mode->Mode,
@@ -1224,13 +1226,10 @@ PlatformBdsEnterFrontPage (
                                 );
       mBootTextModeColumn = (UINT32)BootTextColumn;
       mBootTextModeRow    = (UINT32)BootTextRow;
-    }
 
-    //
-    // Get user defined text mode for setup.
-    //
-    mSetupTextModeColumn       = PcdGet32 (PcdSetupConOutColumn);
-    mSetupTextModeRow          = PcdGet32 (PcdSetupConOutRow);
+      mSetupTextModeColumn = mBootTextModeColumn;
+      mSetupTextModeRow = mBootTextModeRow;
+    }
 
     mModeInitialized           = TRUE;
   }