diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c b/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c
index f52e69cf97..5b99e7c5dd 100644
--- a/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c
+++ b/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c
@@ -2680,6 +2680,7 @@ SaveBrowserContext (
   Context->AdjustNumber         = gAdjustNumber;
   Context->SaveChanges          = gSaveChanges;
   Context->OptionMismatch       = gOptionMismatch;
+  Context->FormSuppress         = gFormSuppress;
   Context->PromptBlockWidth     = gPromptBlockWidth;
   Context->OptionBlockWidth     = gOptionBlockWidth;
   Context->HelpBlockWidth       = gHelpBlockWidth;
@@ -2760,6 +2761,7 @@ RestoreBrowserContext (
   gAdjustNumber         = Context->AdjustNumber;
   gSaveChanges          = Context->SaveChanges;
   gOptionMismatch       = Context->OptionMismatch;
+  gFormSuppress         = Context->FormSuppress;
   gPromptBlockWidth     = Context->PromptBlockWidth;
   gOptionBlockWidth     = Context->OptionBlockWidth;
   gHelpBlockWidth       = Context->HelpBlockWidth;
diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/Setup.h b/MdeModulePkg/Universal/SetupBrowserDxe/Setup.h
index a55195dbfe..041e1b88a8 100644
--- a/MdeModulePkg/Universal/SetupBrowserDxe/Setup.h
+++ b/MdeModulePkg/Universal/SetupBrowserDxe/Setup.h
@@ -490,6 +490,7 @@ typedef struct {
   CHAR16                *AdjustNumber;
   CHAR16                *SaveChanges;
   CHAR16                *OptionMismatch;
+  CHAR16                *FormSuppress;
   CHAR16                PromptBlockWidth;
   CHAR16                OptionBlockWidth;
   CHAR16                HelpBlockWidth;