diff --git a/web/app/dashboard/users/_components/create.tsx b/web/app/dashboard/users/_components/create.tsx
index 76cf721..d3360a7 100644
--- a/web/app/dashboard/users/_components/create.tsx
+++ b/web/app/dashboard/users/_components/create.tsx
@@ -191,18 +191,18 @@ function CreateUserDrawerBody({
   }
 
   return (
-    <DrawerContent className="min-w-2xl">
-      <DrawerHeader>
+    <DrawerContent className="min-w-2xl overflow-hidden">
+      <DrawerHeader className="shrink-0">
         <DrawerTitle>{t("user.createTitle")}</DrawerTitle>
         <DrawerDescription>
           {t("user.createDescription")}
         </DrawerDescription>
       </DrawerHeader>
       <form
-        className="flex h-full flex-col"
+        className="flex min-h-0 flex-1 flex-col"
         onSubmit={handleSubmit(onFormSubmit)}
       >
-        <div className="space-y-4 overflow-y-auto px-4 pb-4">
+        <div className="min-h-0 flex-1 space-y-4 overflow-y-auto px-4 pb-4">
           <Field data-invalid={!!errors.username}>
             <FieldLabel htmlFor="create-username">{t("user.username")}</FieldLabel>
             <FieldContent>
@@ -371,7 +371,7 @@ function CreateUserDrawerBody({
             </FieldContent>
           </Field>
         </div>
-        <DrawerFooter className="border-t">
+        <DrawerFooter className="shrink-0 border-t bg-background">
           <Button type="submit" disabled={saving || rolesLoading}>
             {saving ? t("user.creating") : t("user.createUser")}
           </Button>
diff --git a/web/app/dashboard/users/_components/edit.tsx b/web/app/dashboard/users/_components/edit.tsx
index 6d631ee..a8d23b6 100644
--- a/web/app/dashboard/users/_components/edit.tsx
+++ b/web/app/dashboard/users/_components/edit.tsx
@@ -187,23 +187,23 @@ function UserEditDrawerBody({
   }
 
   return (
-    <DrawerContent className="min-w-2xl">
-      <DrawerHeader>
+    <DrawerContent className="min-w-2xl overflow-hidden">
+      <DrawerHeader className="shrink-0">
         <DrawerTitle>{t("user.editTitle")}</DrawerTitle>
         <DrawerDescription>
           {t("user.currentUser", { username: item?.username || "-" })}
         </DrawerDescription>
       </DrawerHeader>
       {loading ? (
-        <div className="flex items-center justify-center py-12">
+        <div className="flex min-h-0 flex-1 items-center justify-center py-12">
           <div className="text-muted-foreground">{t("user.loading")}</div>
         </div>
       ) : (
         <form
-          className="flex h-full flex-col"
+          className="flex min-h-0 flex-1 flex-col"
           onSubmit={handleSubmit(onFormSubmit)}
         >
-          <div className="space-y-4 px-4 pb-4">
+          <div className="min-h-0 flex-1 space-y-4 overflow-y-auto px-4 pb-4">
             <Field data-invalid={!!errors.nickname}>
               <FieldLabel htmlFor="user-nickname">{t("user.nickname")}</FieldLabel>
               <FieldContent>
@@ -261,7 +261,7 @@ function UserEditDrawerBody({
               </FieldContent>
             </Field>
           </div>
-          <DrawerFooter className="border-t">
+          <DrawerFooter className="shrink-0 border-t bg-background">
             <Button type="submit" disabled={saving || loading}>
               {saving ? t("user.saving") : t("user.saveEdit")}
             </Button>