diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/Presentation.c b/MdeModulePkg/Universal/SetupBrowserDxe/Presentation.c
index f41ac58feb..e5f31d2c31 100644
--- a/MdeModulePkg/Universal/SetupBrowserDxe/Presentation.c
+++ b/MdeModulePkg/Universal/SetupBrowserDxe/Presentation.c
@@ -259,7 +259,7 @@ DisplayPageFrame (
           //
           // Handle left column
           //
-          PrintStringAt (LocalScreen.LeftColumn, Line, StrFrontPageBanner);
+          PrintStringAt (LocalScreen.LeftColumn + BANNER_LEFT_COLUMN_INDENT, Line, StrFrontPageBanner);
           break;
 
         case 1:
diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/Setup.h b/MdeModulePkg/Universal/SetupBrowserDxe/Setup.h
index ba30506d1c..928b929f0b 100644
--- a/MdeModulePkg/Universal/SetupBrowserDxe/Setup.h
+++ b/MdeModulePkg/Universal/SetupBrowserDxe/Setup.h
@@ -59,6 +59,7 @@ extern UINT8  SetupBrowserStrings[];
 //
 #define BANNER_HEIGHT                 6
 #define BANNER_COLUMNS                3
+#define BANNER_LEFT_COLUMN_INDENT     1
 
 #define FRONT_PAGE_HEADER_HEIGHT      6
 #define NONE_FRONT_PAGE_HEADER_HEIGHT 3
diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/Ui.c b/MdeModulePkg/Universal/SetupBrowserDxe/Ui.c
index 3dea095f5f..8ed2c00a70 100644
--- a/MdeModulePkg/Universal/SetupBrowserDxe/Ui.c
+++ b/MdeModulePkg/Universal/SetupBrowserDxe/Ui.c
@@ -1794,8 +1794,7 @@ UiDisplayMenu (
           OriginalRow = Row;
 
           if (Statement->Operand == EFI_IFR_REF_OP && 
-            ((gClassOfVfr & FORMSET_CLASS_PLATFORM_SETUP) == FORMSET_CLASS_PLATFORM_SETUP) &&
-            MenuOption->Col > 2) {
+            MenuOption->Col >= 2) {
             //
             // Print Arrow for Goto button.
             //