diff --git a/MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootMaintenanceManager.vfr b/MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootMaintenanceManager.vfr
index 69fb606324..05c5657489 100644
--- a/MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootMaintenanceManager.vfr
+++ b/MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootMaintenanceManager.vfr
@@ -351,4 +351,16 @@ formset
 
   endform;
 
+  form formid = FORM_TIME_OUT_ID,
+       numeric val = BootTimeOut,
+            nosubmitif
+                prompt = STRING_TOKEN(AUTOBOOT_NOSUBMIT_IF_NEGATIVE),
+                ideqval BootTimeOut < 0
+            endif
+       endnumeric;
+
+  endform;
+
+
+
 endformset;
diff --git a/MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootMaintenanceManagerCustomizedUiSupport.c b/MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootMaintenanceManagerCustomizedUiSupport.c
index 656106fc24..96768fe453 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
   )
+  //important
 {
   HiiCreateNumericOpCode (
     StartOpCodeHandle,