1 files changed, 6 insertions, 2 deletions
diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/Presentation.c b/MdeModulePkg/Universal/SetupBrowserDxe/Presentation.c
index 356cd9cd9a..7bf91df857 100644
--- a/MdeModulePkg/Universal/SetupBrowserDxe/Presentation.c
+++ b/MdeModulePkg/Universal/SetupBrowserDxe/Presentation.c
@@ -2,6 +2,7 @@
 Utility functions for UI presentation.
 
 Copyright (c) 2004 - 2015, Intel Corporation. All rights reserved.<BR>
+(C) Copyright 2015 Hewlett Packard Enterprise Development LP<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
@@ -2505,10 +2506,13 @@ SetupBrowser (
           //
           if (EFI_ERROR (Status)) {
             //
-            // Cross reference will not be taken
+            // Cross reference will not be taken, restore all essential field
             //
-            Selection->FormId = Selection->Form->FormId;
+            Selection->Handle = mCurrentHiiHandle;
+            CopyMem (&Selection->FormSetGuid, &mCurrentFormSetGuid, sizeof (EFI_GUID));
+            Selection->FormId = mCurrentFormId;
             Selection->QuestionId = 0;
+            Selection->Action = UI_ACTION_REFRESH_FORM;
           }
         }