1 files changed, 7 insertions, 2 deletions
diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/FileExplorer.c b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/FileExplorer.c
index 733632b9f4..69e402ef93 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 - 2011, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2004 - 2012, 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
@@ -158,13 +158,18 @@ UpdateFileExplorer (
       switch (CallbackData->FeCurrentState) {
       case FileExplorerStateBootFromFile:
         //
+        // Restore to original mode before  launching boot option.
+        //
+        BdsSetConsoleMode (FALSE);
+
+        //
         // Here boot from file
         //
         BootThisFile (NewFileContext);
         //
         // Set proper video resolution and text mode for setup.
         //
-        ChangeModeForSetup ();
+        BdsSetConsoleMode (TRUE);
         ExitFileExplorer = TRUE;
         break;