diff --git a/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/ConfigAccess.c b/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/ConfigAccess.c
index b1f3651240..0955d7faff 100644
--- a/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/ConfigAccess.c
+++ b/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/ConfigAccess.c
@@ -997,6 +997,11 @@ ThunkCallback (
   //
   if (*ActionRequest == EFI_BROWSER_ACTION_REQUEST_NONE && mHiiPackageListUpdated) {
     *ActionRequest = EFI_BROWSER_ACTION_REQUEST_SUBMIT;
+  } else {
+    if (ConfigAccess->ThunkContext->FormSetSubClass == EFI_FRONT_PAGE_SUBCLASS ||
+        ConfigAccess->ThunkContext->FormSetSubClass == EFI_SINGLE_USE_SUBCLASS) {
+      *ActionRequest = EFI_BROWSER_ACTION_REQUEST_EXIT;
+    }
   }
 
 
diff --git a/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/HiiHandle.c b/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/HiiHandle.c
index 522b05c675..14affde83d 100644
--- a/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/HiiHandle.c
+++ b/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/HiiHandle.c
@@ -61,6 +61,6 @@ FreeHiiHandle (
 
   Num = (UINT16) Handle;
 
-  ASSERT ((mHandle [Num / 8] & (~(1 << (Num % 8)))) != 0);
+  ASSERT ((mHandle [Num / 8] & (1 << (Num % 8))) != 0);
   mHandle [Num / 8] &= (~(1 << (Num % 8)));
 }