diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c b/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c
index a63b9ce0ee..ae7ff7f774 100644
--- a/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c
+++ b/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c
@@ -305,8 +305,6 @@ SendForm (
   //
   InitializeBrowserStrings ();
 
-  gFunctionKeySetting = ENABLE_FUNCTION_KEY_SETTING;
-
   //
   // Ensure we are in Text mode
   //
@@ -4009,6 +4007,8 @@ InitializeFormSet (
     }
   }
 
+  gFunctionKeySetting = ENABLE_FUNCTION_KEY_SETTING;
+
   if ((gClassOfVfr & FORMSET_CLASS_FRONT_PAGE) == FORMSET_CLASS_FRONT_PAGE) {
     gFrontPageHandle = FormSet->HiiHandle;
     gFunctionKeySetting = NONE_FUNCTION_KEY_SETTING;
diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/Ui.c b/MdeModulePkg/Universal/SetupBrowserDxe/Ui.c
index e9f9f70eda..d54466e123 100644
--- a/MdeModulePkg/Universal/SetupBrowserDxe/Ui.c
+++ b/MdeModulePkg/Universal/SetupBrowserDxe/Ui.c
@@ -3285,7 +3285,8 @@ UiDisplayMenu (
           // Check whether Key matches the registered hot key.
           //
           HotKey = NULL;
-          if ((gBrowserSettingScope == SystemLevel) || (gFunctionKeySetting != NONE_FUNCTION_KEY_SETTING)) {
+          if ((gBrowserSettingScope == SystemLevel) || 
+              (Selection->FormEditable && gFunctionKeySetting != NONE_FUNCTION_KEY_SETTING)) {
             HotKey = GetHotKeyFromRegisterList (&Key);
           }
           if (HotKey != NULL) {