diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/FileExplorer.c b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/FileExplorer.c
index 69e402ef93..6f094f207d 100644
--- a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/FileExplorer.c
+++ b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/FileExplorer.c
@@ -1,7 +1,7 @@
 /** @file
   File explorer related functions.
 
-Copyright (c) 2004 - 2012, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2004 - 2014, Intel Corporation. All rights reserved.<BR>
 This program and the accompanying materials
 are licensed and made available under the terms and conditions of the BSD License
 which accompanies this distribution.  The full text of the license may be found at
@@ -140,9 +140,6 @@ UpdateFileExplorer (
     NewFileContext                  = (BM_FILE_CONTEXT *) NewMenuEntry->VariableContext;
 
     if (NewFileContext->IsDir ) {
-      CallbackData->FeDisplayContext = FileExplorerDisplayDirectory;
-
-      RemoveEntryList (&NewMenuEntry->Link);
       BOpt_FreeMenu (&DirectoryMenu);
       Status = BOpt_FindFiles (CallbackData, NewMenuEntry);
        if (EFI_ERROR (Status)) {
@@ -150,10 +147,10 @@ UpdateFileExplorer (
          goto exit;
        }
       CreateMenuStringToken (CallbackData, CallbackData->FeHiiHandle, &DirectoryMenu);
-      BOpt_DestroyMenuEntry (NewMenuEntry);
 
       UpdateFileExplorePage (CallbackData, &DirectoryMenu);
 
+      CallbackData->FeDisplayContext = FileExplorerDisplayDirectory;
     } else {
       switch (CallbackData->FeCurrentState) {
       case FileExplorerStateBootFromFile:
diff --git a/SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigFileExplorer.c b/SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigFileExplorer.c
index 548d95df53..3db71d6860 100644
--- a/SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigFileExplorer.c
+++ b/SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigFileExplorer.c
@@ -1,7 +1,7 @@
 /** @file
   Internal file explorer functions for SecureBoot configuration module.
 
-Copyright (c) 2012 - 2013, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2012 - 2014, Intel Corporation. All rights reserved.<BR>
 This program and the accompanying materials
 are licensed and made available under the terms and conditions of the BSD License
 which accompanies this distribution.  The full text of the license may be found at
@@ -1133,9 +1133,6 @@ UpdateFileExplorer (
     NewFileContext = (SECUREBOOT_FILE_CONTEXT *) NewMenuEntry->FileContext;
 
     if (NewFileContext->IsDir ) {
-      PrivateData->FeDisplayContext = FileExplorerDisplayDirectory;
-
-      RemoveEntryList (&NewMenuEntry->Link);
       FreeMenu (&DirectoryMenu);
       Status = FindFiles (NewMenuEntry);
        if (EFI_ERROR (Status)) {
@@ -1143,10 +1140,9 @@ UpdateFileExplorer (
          goto OnExit;
        }
       CreateMenuStringToken (PrivateData->HiiHandle, &DirectoryMenu);
-      DestroyMenuEntry (NewMenuEntry);
-
       UpdateFileExplorePage (PrivateData->HiiHandle, &DirectoryMenu, PrivateData->FeCurrentState);
 
+      PrivateData->FeDisplayContext = FileExplorerDisplayDirectory;
     } else {
       if (PrivateData->FeCurrentState == FileExplorerStateEnrollPkFile) {
         FormId = SECUREBOOT_ADD_PK_FILE_FORM_ID;