diff --git a/src/frontend/src/components/codeTabsComponent/index.tsx b/src/frontend/src/components/codeTabsComponent/index.tsx
index b304518c2..10a8c8c79 100644
--- a/src/frontend/src/components/codeTabsComponent/index.tsx
+++ b/src/frontend/src/components/codeTabsComponent/index.tsx
@@ -753,7 +753,7 @@ export default function CodeTabsComponent({
                                                   )
                                                 )}
                                               >
-                                                <div className="mx-auto">
+                                                <div className="mx-auto max-h-48 overflow-auto custom-scroll">
                                                   <KeypairListComponent
                                                     disabled={false}
                                                     editNode={true}
diff --git a/src/frontend/src/components/keypairListComponent/index.tsx b/src/frontend/src/components/keypairListComponent/index.tsx
index e9c016ece..42043d1c6 100644
--- a/src/frontend/src/components/keypairListComponent/index.tsx
+++ b/src/frontend/src/components/keypairListComponent/index.tsx
@@ -42,7 +42,7 @@ export default function KeypairListComponent({
     <div
       className={classNames(
         value?.length > 1 && editNode ? "my-1" : "",
-        "flex flex-col gap-3"
+        "flex flex-col gap-3 h-full"
       )}
     >
       {value?.map((obj, index) => {
diff --git a/src/frontend/src/modals/EditNodeModal/index.tsx b/src/frontend/src/modals/EditNodeModal/index.tsx
index be21feda9..02753cc44 100644
--- a/src/frontend/src/modals/EditNodeModal/index.tsx
+++ b/src/frontend/src/modals/EditNodeModal/index.tsx
@@ -256,7 +256,7 @@ const EditNodeModal = forwardRef(
                                 </div>
                               ) : myData.current.node?.template[templateParam]
                                   .type === "dict" ? (
-                                <div className="mt-2 w-full">
+                                <div className="mt-2 w-full max-h-48 overflow-auto custom-scroll">
                                   <KeypairListComponent
                                     disabled={disabled}
                                     editNode={true}