diff --git a/components/ItemCreator.tsx b/components/ItemCreator.tsx
index 78232b6..fbbf2a0 100644
--- a/components/ItemCreator.tsx
+++ b/components/ItemCreator.tsx
@@ -74,7 +74,7 @@ const ItemCreator: React.FC<ItemCreatorProps> = ({onItemsCreate}) => {
 
   return (
     <Form {...form}>
-      <form onSubmit={form.handleSubmit(onSubmit)}>
+      <form onSubmit={form.handleSubmit(onSubmit)} className="flex flex-col overflow-y-hidden">
         <FormField
           control={form.control}
           name="files"
@@ -100,7 +100,7 @@ const ItemCreator: React.FC<ItemCreatorProps> = ({onItemsCreate}) => {
             </FormItem>
           )}
         />
-        <div className="grid grid-cols-2 md:grid-cols-3 lg:grid-cols-4 gap-4 mt-4">
+        <div className="grid grid-cols-2 md:grid-cols-3 lg:grid-cols-4 gap-4 mt-4 overflow-y-auto pe-6">
           {uploadedItems.map((item) => (
             <div key={item.id} className="space-y-2">
               <div className="w-28 h-28 relative">
diff --git a/components/ItemManager.tsx b/components/ItemManager.tsx
index 1153733..956aaf6 100644
--- a/components/ItemManager.tsx
+++ b/components/ItemManager.tsx
@@ -174,7 +174,7 @@ const ItemManager: React.FC<ItemManagerProps> = ({
       </DropdownMenu>
 
       <Dialog open={isItemCreatorOpen} onOpenChange={setIsItemCreatorOpen}>
-        <DialogContent>
+        <DialogContent className="max-h-[80vh] overflow-hidden flex flex-col">
           <DialogHeader>
             <DialogTitle>Add New Items</DialogTitle>
             <DialogDescription>