Index: Universal/DisplayEngineDxe/FormDisplay.c
===================================================================
--- Universal/DisplayEngineDxe/FormDisplay.c	(revision 17184)
+++ Universal/DisplayEngineDxe/FormDisplay.c	(working copy)
@@ -1901,6 +1901,11 @@
     }
     *SkipValue     = 0;
   }
+
+  //
+  // First enter to show the menu, update highlight info.
+  //
+  UpdateHighlightMenuInfo (*HighlightMenu, *TopOfScreen, *SkipValue);
 }
 
 /**
Index: Universal/DisplayEngineDxe/FormDisplay.h
===================================================================
--- Universal/DisplayEngineDxe/FormDisplay.h	(revision 17184)
+++ Universal/DisplayEngineDxe/FormDisplay.h	(working copy)
@@ -633,4 +633,19 @@
   IN  VOID         *Context
   );
 
+/**
+  Record the highlight menu and top of screen menu info.
+
+  @param  Highlight               The menu opton which is highlight.
+  @param  TopOfScreen             The menu opton which is at the top of the form.
+  @param  SkipValue               The skip line info for the top of screen menu.
+
+**/
+VOID
+UpdateHighlightMenuInfo (
+  IN  LIST_ENTRY                      *Highlight,
+  IN  LIST_ENTRY                      *TopOfScreen,
+  IN  UINTN                           SkipValue
+  );
+
 #endif