From 3026d8fad21a8a4e243e3ababedd3016516996e2 Mon Sep 17 00:00:00 2001
From: Jon Koops <jonkoops@gmail.com>
Date: Mon, 24 Apr 2023 17:33:15 +0200
Subject: [PATCH] Ensure correct options are displayed for 'Archive format'
 (#19914)

---
 js/apps/admin-ui/src/clients/keys/GenerateKeyDialog.tsx | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/js/apps/admin-ui/src/clients/keys/GenerateKeyDialog.tsx b/js/apps/admin-ui/src/clients/keys/GenerateKeyDialog.tsx
index 231c5d5f81..4d2237bcaa 100644
--- a/js/apps/admin-ui/src/clients/keys/GenerateKeyDialog.tsx
+++ b/js/apps/admin-ui/src/clients/keys/GenerateKeyDialog.tsx
@@ -68,7 +68,7 @@ export const KeyForm = ({
   const { cryptoInfo } = useServerInfo();
   const supportedKeystoreTypes = [
     ...(cryptoInfo?.supportedKeystoreTypes ?? []),
-    ...(hasPem ? CERT_PEM : []),
+    ...(hasPem ? [CERT_PEM] : []),
   ];
 
   return (
@@ -99,6 +99,7 @@ export const KeyForm = ({
               variant={SelectVariant.single}
               aria-label={t("archiveFormat")}
               isOpen={openArchiveFormat}
+              menuAppendTo="parent"
             >
               {supportedKeystoreTypes.map((option) => (
                 <SelectOption