diff --git a/MsGraphicsPkg/Library/SimpleUIToolKit/SimpleUIToolKit.c b/MsGraphicsPkg/Library/SimpleUIToolKit/SimpleUIToolKit.c
index 9fcd3ffc44..843b3682f2 100644
--- a/MsGraphicsPkg/Library/SimpleUIToolKit/SimpleUIToolKit.c
+++ b/MsGraphicsPkg/Library/SimpleUIToolKit/SimpleUIToolKit.c
@@ -42,9 +42,9 @@ InitializeUIToolKit (
 
   // Determine if the GOP is available.
   //
-  Status = gBS->LocateProtocol (
+  Status = gBS->HandleProtocol (
+                  gST->ConsoleOutHandle,
                   &gEfiGraphicsOutputProtocolGuid,
-                  NULL,
                   (VOID **)&mUITGop
                   );
 
diff --git a/MsGraphicsPkg/SimpleWindowManagerDxe/WindowManager.c b/MsGraphicsPkg/SimpleWindowManagerDxe/WindowManager.c
index 5603306524..f241013a7b 100644
--- a/MsGraphicsPkg/SimpleWindowManagerDxe/WindowManager.c
+++ b/MsGraphicsPkg/SimpleWindowManagerDxe/WindowManager.c
@@ -1507,9 +1507,9 @@ GopRegisteredCallback (
 
   // Determine if the Graphics Output Protocol is available on the Console Out handle.
   //
-  Status = gBS->LocateProtocol (
+  Status = gBS->HandleProtocol (
+                  gST->ConsoleOutHandle,
                   &gEfiGraphicsOutputProtocolGuid,
-                  NULL,
                   (VOID **)&mGop
                   );