diff --git a/apps/dashboard/app/(app)/apis/[apiId]/keys/[keyAuthId]/[keyId]/components/rbac/permissions.tsx b/apps/dashboard/app/(app)/apis/[apiId]/keys/[keyAuthId]/[keyId]/components/rbac/permissions.tsx
index 30a91dfe8f..fbdc8486f9 100644
--- a/apps/dashboard/app/(app)/apis/[apiId]/keys/[keyAuthId]/[keyId]/components/rbac/permissions.tsx
+++ b/apps/dashboard/app/(app)/apis/[apiId]/keys/[keyAuthId]/[keyId]/components/rbac/permissions.tsx
@@ -55,7 +55,7 @@ export function PermissionList({ roles, keyId }: PermissionTreeProps) {
   });
 
   return (
-    <Card className="h-full">
+    <Card className="flex flex-col flex-grow h-full min-h-[250px]">
       <CardHeader className="pb-0">
         <div className="mb-2">
           <CardTitle>Roles</CardTitle>
diff --git a/internal/ui/src/components/dialog/dialog-container.tsx b/internal/ui/src/components/dialog/dialog-container.tsx
index c70452c12b..e95bee7814 100644
--- a/internal/ui/src/components/dialog/dialog-container.tsx
+++ b/internal/ui/src/components/dialog/dialog-container.tsx
@@ -36,7 +36,7 @@ export const DialogContainer = ({
     <Dialog open={isOpen} onOpenChange={onOpenChange}>
       <DialogContent
         className={cn(
-          "drop-shadow-2xl border-gray-4 max-h-[90vh] overflow-y-auto !rounded-2xl p-0 gap-0",
+          "drop-shadow-2xl border-gray-4 max-h-[90vh] overflow-hidden !rounded-2xl p-0 gap-0 flex flex-col flex-grow",
           "w-[90%] md:w-[70%] lg:w-[70%] xl:w-[50%] 2xl:w-[45%] max-w-[600px] max-h-[90vh] sm:max-h-[90vh] md:max-h-[70vh] lg:max-h-[90vh] xl:max-h-[80vh]",
           className,
         )}
diff --git a/internal/ui/src/components/dialog/parts/dialog-parts.tsx b/internal/ui/src/components/dialog/parts/dialog-parts.tsx
index bf2f815863..f89b85be13 100644
--- a/internal/ui/src/components/dialog/parts/dialog-parts.tsx
+++ b/internal/ui/src/components/dialog/parts/dialog-parts.tsx
@@ -37,7 +37,12 @@ export const DefaultDialogContentArea = ({
   className,
 }: DefaultDialogContentAreaProps) => {
   return (
-    <div className={cn("bg-grayA-2 flex flex-col gap-4 py-4 px-6 text-gray-11", className)}>
+    <div
+      className={cn(
+        "bg-grayA-2 flex flex-col gap-4 py-4 px-6 text-gray-11 overflow-y-auto scrollbar-hide flex-grow",
+        className,
+      )}
+    >
       {children}
     </div>
   );