diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/InputHandler.c b/MdeModulePkg/Universal/SetupBrowserDxe/InputHandler.c
index b958f4fdc7..5235d32fe8 100644
--- a/MdeModulePkg/Universal/SetupBrowserDxe/InputHandler.c
+++ b/MdeModulePkg/Universal/SetupBrowserDxe/InputHandler.c
@@ -498,6 +498,8 @@ TheKey2:
             PrintChar (RIGHT_NUMERIC_DELIMITER);
           }
         }
+
+        goto EnterCarriageReturn;
         break;
 
       case SCAN_UP:
diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/Presentation.c b/MdeModulePkg/Universal/SetupBrowserDxe/Presentation.c
index 47f99f5b8d..a35ca35df9 100644
--- a/MdeModulePkg/Universal/SetupBrowserDxe/Presentation.c
+++ b/MdeModulePkg/Universal/SetupBrowserDxe/Presentation.c
@@ -462,7 +462,7 @@ DisplayForm (
 
   CopyMem (&LocalScreen, &gScreenDimensions, sizeof (EFI_SCREEN_DESCRIPTOR));
 
-  StringPtr = GetToken (Selection->FormSet->FormSetTitle, Handle);
+  StringPtr = GetToken (Selection->Form->FormTitle, Handle);
 
   if (gClassOfVfr != EFI_FRONT_PAGE_SUBCLASS) {
     gST->ConOut->SetAttribute (gST->ConOut, TITLE_TEXT | TITLE_BACKGROUND);
diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c b/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c
index 663bf7a209..fd5aee4ca1 100644
--- a/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c
+++ b/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c
@@ -298,7 +298,7 @@ SendForm (
       // Initialize internal data structures of FormSet
       //
       Status = InitializeFormSet (Selection->Handle, &Selection->FormSetGuid, FormSet);
-      if (EFI_ERROR (Status)) {
+      if (EFI_ERROR (Status) || IsListEmpty (&FormSet->FormListHead)) {
         DestroyFormSet (FormSet);
         break;
       }