diff --git a/lib/libefivar/efivar-dp-format.c b/lib/libefivar/efivar-dp-format.c
index 24f4cdc94d98..e2a5e666ce7b 100644
--- a/lib/libefivar/efivar-dp-format.c
+++ b/lib/libefivar/efivar-dp-format.c
@@ -492,6 +492,27 @@ DevPathToTextAcpiEx (
   UIDStr = HIDStr + AsciiStrLen (HIDStr) + 1;
   CIDStr = UIDStr + AsciiStrLen (UIDStr) + 1;
 
+  if (DisplayOnly) {
+     if ((EISA_ID_TO_NUM (AcpiEx->HID) == 0x0A03) ||
+         (EISA_ID_TO_NUM (AcpiEx->CID) == 0x0A03 && EISA_ID_TO_NUM (AcpiEx->HID) != 0x0A08)) {
+       if (AcpiEx->UID == 0) {
+         UefiDevicePathLibCatPrint (Str, "PciRoot(%s)", UIDStr);
+       } else {
+         UefiDevicePathLibCatPrint (Str, "PciRoot(0x%x)", AcpiEx->UID);
+       }
+       return;
+     }
+
+     if (EISA_ID_TO_NUM (AcpiEx->HID) == 0x0A08 || EISA_ID_TO_NUM (AcpiEx->CID) == 0x0A08) {
+       if (AcpiEx->UID == 0) {
+         UefiDevicePathLibCatPrint (Str, "PcieRoot(%s)", UIDStr);
+       } else {
+         UefiDevicePathLibCatPrint (Str, "PcieRoot(0x%x)", AcpiEx->UID);
+       }
+       return;
+     }
+   }
+
   //
   // Converts EISA identification to string.
   //