3 files changed, 7 insertions, 7 deletions
diff --git a/MdeModulePkg/Library/CustomizedDisplayLib/CustomizedDisplayLib.c b/MdeModulePkg/Library/CustomizedDisplayLib/CustomizedDisplayLib.c
index b3da13d..1099b64 100644
--- a/MdeModulePkg/Library/CustomizedDisplayLib/CustomizedDisplayLib.c
+++ b/MdeModulePkg/Library/CustomizedDisplayLib/CustomizedDisplayLib.c
@@ -64,7 +64,7 @@ DisplayPageFrame (
     return EFI_INVALID_PARAMETER;
   }
 
-  Status = ScreenDiemensionInfoValidate (FormData);
+  Status = ScreenDimensionInfoValidate (FormData);
   if (EFI_ERROR (Status)) {
     return Status;
   }
diff --git a/MdeModulePkg/Library/CustomizedDisplayLib/CustomizedDisplayLibInternal.c b/MdeModulePkg/Library/CustomizedDisplayLib/CustomizedDisplayLibInternal.c
index 58130d9..2d807bf 100644
--- a/MdeModulePkg/Library/CustomizedDisplayLib/CustomizedDisplayLibInternal.c
+++ b/MdeModulePkg/Library/CustomizedDisplayLib/CustomizedDisplayLibInternal.c
@@ -378,7 +378,7 @@ ProcessExternedOpcode (
 }
 
 /**
-  Validate the input screen diemenstion info.
+  Validate the input screen dimension info.
 
   @param  FormData               The input form data info.
 
@@ -387,7 +387,7 @@ ProcessExternedOpcode (
 
 **/
 EFI_STATUS
-ScreenDiemensionInfoValidate (
+ScreenDimensionInfoValidate (
   IN FORM_DISPLAY_ENGINE_FORM  *FormData
   )
 {
@@ -598,7 +598,7 @@ PrintHotKeyHelpString (
     ColumnIndex = Index % 3;
     if (ColumnIndex == 0) {
       CurrentCol       = LocalScreen.LeftColumn + 2 * ColumnWidth;
-      ColumnIndexWidth = ColumnWidth - 1;
+      ColumnIndexWidth = LocalScreen.RightColumn - CurrentCol - 1;
     } else if (ColumnIndex == 1) {
       CurrentCol       = LocalScreen.LeftColumn + ColumnWidth;
       ColumnIndexWidth = ColumnWidth;
@@ -646,7 +646,7 @@ PrintHotKeyHelpString (
     ColumnIndex = Index % 3;
     if (ColumnIndex == 0) {
       CurrentCol       = LocalScreen.LeftColumn + 2 * ColumnWidth;
-      ColumnIndexWidth = ColumnWidth - 1;
+      ColumnIndexWidth = LocalScreen.RightColumn - CurrentCol - 1;
       ColumnIndex++;
       PrintStringAtWithWidth (CurrentCol, CurrentRow, gLibEmptyString, ColumnIndexWidth);
     }
diff --git a/MdeModulePkg/Library/CustomizedDisplayLib/CustomizedDisplayLibInternal.h b/MdeModulePkg/Library/CustomizedDisplayLib/CustomizedDisplayLibInternal.h
index 01213cb..a9ac17c 100644
--- a/MdeModulePkg/Library/CustomizedDisplayLib/CustomizedDisplayLibInternal.h
+++ b/MdeModulePkg/Library/CustomizedDisplayLib/CustomizedDisplayLibInternal.h
@@ -129,7 +129,7 @@ PrintFramework (
   );
 
 /**
-  Validate the input screen diemenstion info.
+  Validate the input screen dimension info.
 
   @param  FormData               The input form data info.
 
@@ -138,7 +138,7 @@ PrintFramework (
 
 **/
 EFI_STATUS
-ScreenDiemensionInfoValidate (
+ScreenDimensionInfoValidate (
   IN FORM_DISPLAY_ENGINE_FORM  *FormData
   );