apps/frontend/src/modules/aspectManagement/modals/AspectFormModal.tsx

@@ -189,8 +189,8 @@ export default function AspectFormModal() {
                     </AlertDialogDescription>
                 </AlertDialogHeader>
 
-                <ScrollArea className="h-[300px] p-4">
                 <form onSubmit={handleSubmit}>
+                    <ScrollArea className="h-[300px] p-4">
                         <div className="grid gap-4">
                             <div className="mb-4">
                                 <Label htmlFor="name" className="block text-left mb-1">Nama Aspek</Label>
@@ -266,6 +266,8 @@ export default function AspectFormModal() {
                                 </Button>
                             )}
                         </div>
+                    </ScrollArea>
+                    
                     <AlertDialogFooter>
                         <AlertDialogCancel disabled={isSubmitting}>Tutup</AlertDialogCancel>
                         {formType !== "detail" && (
@@ -275,7 +277,6 @@ export default function AspectFormModal() {
                         )}
                     </AlertDialogFooter>
                 </form>
-                </ScrollArea>
             </AlertDialogContent>
         </AlertDialog>
     );

apps/frontend/src/modules/assessmentRequestManagement/modals/AssessmentRequestManagementFormModal.tsx

@@ -198,6 +198,7 @@ export default function AssessmentRequestManagementFormModal({
 							],
 						})}
 
+					</ScrollArea>
 					<div className="flex justify-end gap-4 mt-4">
 						<Button 
 							onClick={onClose} 
@@ -228,7 +229,6 @@ export default function AssessmentRequestManagementFormModal({
 							</>
 						)}
 					</div>
-					</ScrollArea>
 				</DialogDescription>
 			</DialogContent>
 		</Dialog>