diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/FileExplorer.c b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/FileExplorer.c
index 2eaf9b2d59..98dc54c939 100644
--- a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/FileExplorer.c
+++ b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/FileExplorer.c
@@ -139,9 +139,9 @@ UpdateFileExplorer (
 
     CallbackData->FeDisplayContext  = FileExplorerDisplayDirectory;
 
-    NewFileContext                  = (BM_FILE_CONTEXT *) NewMenuEntry->VariableContext;
-
     if (NewFileContext->IsDir ) {
+      NewFileContext = (BM_FILE_CONTEXT *) NewMenuEntry->VariableContext;
+
       RemoveEntryList (&NewMenuEntry->Link);
       BOpt_FreeMenu (&DirectoryMenu);
       Status = BOpt_FindFiles (CallbackData, NewMenuEntry);