diff --git a/MdeModulePkg/Library/CustomizedDisplayLib/CustomizedDisplayLib.uni b/MdeModulePkg/Library/CustomizedDisplayLib/CustomizedDisplayLib.uni
index ca3c255a29..abc03fc2c1 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  "Invalid input value"
-                                       #language fr-FR  "Invalid input value"
+#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 5157a8ba0b..60364c0cc4 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) || ((NumericOp->Flags & EFI_IFR_DISPLAY) == EFI_IFR_DISPLAY_UINT_DEC) ){
+    } else if ( ((NumericOp->Flags & EFI_IFR_DISPLAY) == 0)  ){
       //
       // Display with EFI_IFR_DISPLAY_INT_DEC type. Support negative number.
       //
@@ -747,16 +747,15 @@ GetNumericInput (
 
     case '+':
     case '-':
+    if (ManualInput && ((NumericOp->Flags & EFI_IFR_DISPLAY) == EFI_IFR_DISPLAY_UINT_DEC)) {
+       UpdateStatusBar(INPUT_ERROR, TRUE);
+       break;
+     }
       if (ManualInput && IntInput) {
         //
         // In Manual input mode, check whether input the negative flag.
         //
         if (Key.UnicodeChar == '-') {
-          if ((NumericOp->Flags & EFI_IFR_DISPLAY) == EFI_IFR_DISPLAY_UINT_DEC){
-            if (Count == 0) UpdateStatusBar(INPUT_ERROR, TRUE);
-            break;
-          }
-
           if (Negative) {
             break;
           }