diff --git a/MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootMaintenanceManager.vfr b/MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootMaintenanceManager.vfr
index 69fb606324..8495171378 100644
--- a/MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootMaintenanceManager.vfr
+++ b/MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootMaintenanceManager.vfr
@@ -351,4 +351,5 @@ formset
 
   endform;
 
+
 endformset;
diff --git a/MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootMaintenanceManagerCustomizedUiSupport.c b/MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootMaintenanceManagerCustomizedUiSupport.c
index a30f5f1bbf..2f2d672efa 100644
--- a/MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootMaintenanceManagerCustomizedUiSupport.c
+++ b/MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootMaintenanceManagerCustomizedUiSupport.c
@@ -122,6 +122,7 @@ BmmCreateTimeOutMenu (
   IN EFI_HII_HANDLE              HiiHandle,
   IN VOID                        *StartOpCodeHandle
   )
+
 {
   VOID                        *DefaultOpCodeHandle;
 
diff --git a/MdeModulePkg/Library/CustomizedDisplayLib/CustomizedDisplayLib.uni b/MdeModulePkg/Library/CustomizedDisplayLib/CustomizedDisplayLib.uni
index 2df5afbd22..ca3c255a29 100644
--- a/MdeModulePkg/Library/CustomizedDisplayLib/CustomizedDisplayLib.uni
+++ b/MdeModulePkg/Library/CustomizedDisplayLib/CustomizedDisplayLib.uni
@@ -43,8 +43,8 @@
                                        #language fr-FR  "<Spacebar>Bascule la Case de pointage"
 #string NV_UPDATE_MESSAGE              #language en-US  "Configuration changed"
                                        #language fr-FR  "Configuration changed"
-#string INPUT_ERROR_MESSAGE            #language en-US  "!!"
-                                       #language fr-FR  "!!"
+#string INPUT_ERROR_MESSAGE            #language en-US  "Invalid input value"
+                                       #language fr-FR  "Invalid input value"
 #string EMPTY_STRING                   #language en-US  ""
                                        #language fr-FR  ""
 #string ARE_YOU_SURE_YES               #language en-US  "Y"
diff --git a/MdeModulePkg/Universal/DisplayEngineDxe/InputHandler.c b/MdeModulePkg/Universal/DisplayEngineDxe/InputHandler.c
index 722c56aa28..a7d86b4c91 100644
--- a/MdeModulePkg/Universal/DisplayEngineDxe/InputHandler.c
+++ b/MdeModulePkg/Universal/DisplayEngineDxe/InputHandler.c
@@ -619,7 +619,7 @@ GetNumericInput (
   if ((Question->OpCode->OpCode == EFI_IFR_NUMERIC_OP) && (NumericOp != NULL)) {
     if ((NumericOp->Flags & EFI_IFR_DISPLAY) == EFI_IFR_DISPLAY_UINT_HEX){
       HexInput = TRUE;
-    } else if ((NumericOp->Flags & EFI_IFR_DISPLAY) == 0){
+    } else if ( ((NumericOp->Flags & EFI_IFR_DISPLAY) == 0) || ((NumericOp->Flags & EFI_IFR_DISPLAY) == EFI_IFR_DISPLAY_UINT_DEC) ){
       //
       // Display with EFI_IFR_DISPLAY_INT_DEC type. Support negative number.
       //
@@ -752,6 +752,11 @@ GetNumericInput (
         // In Manual input mode, check whether input the negative flag.
         //
         if (Key.UnicodeChar == '-') {
+          if ((NumericOp->Flags & EFI_IFR_DISPLAY) == EFI_IFR_DISPLAY_UINT_DEC){
+            UpdateStatusBar(INPUT_ERROR, TRUE);
+            break;
+          }
+
           if (Negative) {
             break;
           }