diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/InputHandler.c b/MdeModulePkg/Universal/SetupBrowserDxe/InputHandler.c
index 5f857845aa..dd022ce554 100644
--- a/MdeModulePkg/Universal/SetupBrowserDxe/InputHandler.c
+++ b/MdeModulePkg/Universal/SetupBrowserDxe/InputHandler.c
@@ -726,6 +726,16 @@ TheKey2:
 EnterCarriageReturn:
 
     case CHAR_CARRIAGE_RETURN:
+      //
+      // Validate input value with Minimum value.
+      //
+      if (EditValue < Minimum) {
+        UpdateStatusBar (Selection, INPUT_ERROR, Question->QuestionFlags, TRUE);
+        break;
+      } else {
+        UpdateStatusBar (Selection, INPUT_ERROR, Question->QuestionFlags, FALSE);
+      }
+
       //
       // Store Edit value back to Question
       //