diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/Presentation.c b/MdeModulePkg/Universal/SetupBrowserDxe/Presentation.c
index 63996b62a6..2c9fa9761a 100644
--- a/MdeModulePkg/Universal/SetupBrowserDxe/Presentation.c
+++ b/MdeModulePkg/Universal/SetupBrowserDxe/Presentation.c
@@ -1325,7 +1325,7 @@ SetupBrowser (
       if (mHiiPackageListUpdated) {
         Selection->Action = UI_ACTION_REFRESH_FORMSET;
         mHiiPackageListUpdated = FALSE;
-        goto Done;
+        break;
       }
     }
 
@@ -1349,7 +1349,7 @@ SetupBrowser (
     if (mHiiPackageListUpdated) {
       Selection->Action = UI_ACTION_REFRESH_FORMSET;
       mHiiPackageListUpdated = FALSE;
-      goto Done;
+      break;
     }
 
     //