3 files changed, 5 insertions, 4 deletions
diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c b/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c
index 42edc08970..aaff62a6cb 100644
--- a/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c
+++ b/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c
@@ -269,7 +269,8 @@ SendForm (
 
   gOptionBlockWidth = (CHAR16) ((gScreenDimensions.RightColumn - gScreenDimensions.LeftColumn) / 3);
   gHelpBlockWidth   = gOptionBlockWidth;
-  gPromptBlockWidth = gOptionBlockWidth;
+  gPromptBlockWidth = gOptionBlockWidth + LEFT_SKIPPED_COLUMNS;
+  gOptionBlockWidth = gOptionBlockWidth - LEFT_SKIPPED_COLUMNS;
 
   //
   // Initialize the strings for the browser, upon exit of the browser, the strings will be freed
diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/Setup.h b/MdeModulePkg/Universal/SetupBrowserDxe/Setup.h
index 5239b44caa..f5717e1c62 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          4
+#define LEFT_SKIPPED_COLUMNS          1
 #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 3448df8d19..a77d4a9e02 100644
--- a/MdeModulePkg/Universal/SetupBrowserDxe/Ui.c
+++ b/MdeModulePkg/Universal/SetupBrowserDxe/Ui.c
@@ -1134,7 +1134,7 @@ GetWidth (
     Width -= SUBTITLE_INDENT;
   }
 
-  return Width;
+  return Width - LEFT_SKIPPED_COLUMNS;
 }
 
 /**
@@ -1704,7 +1704,7 @@ UiDisplayMenu (
     Row     = LocalScreen.TopRow + NONE_FRONT_PAGE_HEADER_HEIGHT + SCROLL_ARROW_HEIGHT;
   }
 
-  Col = LocalScreen.LeftColumn;
+  Col = LocalScreen.LeftColumn + LEFT_SKIPPED_COLUMNS;
   BottomRow = LocalScreen.BottomRow - STATUS_BAR_HEIGHT - FOOTER_HEIGHT - SCROLL_ARROW_HEIGHT - 1;
 
   Selection->TopRow = TopRow;