diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/FileExplorer.c b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/FileExplorer.c
index 98dc54c939..26a2764eeb 100644
--- a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/FileExplorer.c
+++ b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/FileExplorer.c
@@ -137,10 +137,10 @@ UpdateFileExplorer (
       NewMenuEntry = BOpt_GetMenuEntry (&DirectoryMenu, FileOptionMask);
     }
 
-    CallbackData->FeDisplayContext  = FileExplorerDisplayDirectory;
+    NewFileContext                  = (BM_FILE_CONTEXT *) NewMenuEntry->VariableContext;
 
     if (NewFileContext->IsDir ) {
-      NewFileContext = (BM_FILE_CONTEXT *) NewMenuEntry->VariableContext;
+      CallbackData->FeDisplayContext = FileExplorerDisplayDirectory;
 
       RemoveEntryList (&NewMenuEntry->Link);
       BOpt_FreeMenu (&DirectoryMenu);