diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/Setup.h b/MdeModulePkg/Universal/SetupBrowserDxe/Setup.h
index f5717e1c62..ba30506d1c 100644
--- a/MdeModulePkg/Universal/SetupBrowserDxe/Setup.h
+++ b/MdeModulePkg/Universal/SetupBrowserDxe/Setup.h
@@ -62,7 +62,7 @@ extern UINT8  SetupBrowserStrings[];
 
 #define FRONT_PAGE_HEADER_HEIGHT      6
 #define NONE_FRONT_PAGE_HEADER_HEIGHT 3
-#define LEFT_SKIPPED_COLUMNS          1
+#define LEFT_SKIPPED_COLUMNS          3
 #define FOOTER_HEIGHT                 4
 #define STATUS_BAR_HEIGHT             1
 #define SCROLL_ARROW_HEIGHT           1
diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/Ui.c b/MdeModulePkg/Universal/SetupBrowserDxe/Ui.c
index 83b13b1932..54f9db0978 100644
--- a/MdeModulePkg/Universal/SetupBrowserDxe/Ui.c
+++ b/MdeModulePkg/Universal/SetupBrowserDxe/Ui.c
@@ -1793,12 +1793,14 @@ UiDisplayMenu (
           Width       = GetWidth (Statement, MenuOption->Handle);
           OriginalRow = Row;
 
-          if (Statement->Operand == EFI_IFR_REF_OP && ((gClassOfVfr & FORMSET_CLASS_PLATFORM_SETUP) == FORMSET_CLASS_PLATFORM_SETUP)) {
+          if (Statement->Operand == EFI_IFR_REF_OP && 
+            ((gClassOfVfr & FORMSET_CLASS_PLATFORM_SETUP) == FORMSET_CLASS_PLATFORM_SETUP) &&
+            MenuOption->Col > 2) {
             //
             // Print Arrow for Goto button.
             //
             PrintAt (
-              MenuOption->Col - LEFT_SKIPPED_COLUMNS,
+              MenuOption->Col - 2,
               Row,
               L"%c",
               GEOMETRICSHAPE_RIGHT_TRIANGLE