diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/InputHandler.c b/MdeModulePkg/Universal/SetupBrowserDxe/InputHandler.c
index d31a9b9ddc..8f3b9e72dc 100644
--- a/MdeModulePkg/Universal/SetupBrowserDxe/InputHandler.c
+++ b/MdeModulePkg/Universal/SetupBrowserDxe/InputHandler.c
@@ -302,8 +302,8 @@ GetNumericInput (
       switch (QuestionValue->Value.date.Month) {
       case 2:
         if ((QuestionValue->Value.date.Year % 4) == 0  && 
-            (QuestionValue->Value.date.Year % 100) != 0 && 
-            (QuestionValue->Value.date.Year % 400) == 0) {
+            ((QuestionValue->Value.date.Year % 100) != 0 || 
+            (QuestionValue->Value.date.Year % 400) == 0)) {
           Maximum = 29;
         } else {
           Maximum = 28;