diff --git a/apps/frontend/src/modules/aspectManagement/modals/AspectFormModal.tsx b/apps/frontend/src/modules/aspectManagement/modals/AspectFormModal.tsx
index b24517b..e7ab84c 100644
--- a/apps/frontend/src/modules/aspectManagement/modals/AspectFormModal.tsx
+++ b/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}>
+                <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,16 +266,17 @@ export default function AspectFormModal() {
                                 </Button>
                             )}
                         </div>
-                        <AlertDialogFooter>
-                            <AlertDialogCancel disabled={isSubmitting}>Tutup</AlertDialogCancel>
-                            {formType !== "detail" && (
-                                <Button type="submit" disabled={isSubmitting}>
-                                    {isSubmitting ? "Menyimpan..." : modalTitle}
-                                </Button>
-                            )}
-                        </AlertDialogFooter>
-                    </form>
-                </ScrollArea>
+                    </ScrollArea>
+                    
+                    <AlertDialogFooter>
+                        <AlertDialogCancel disabled={isSubmitting}>Tutup</AlertDialogCancel>
+                        {formType !== "detail" && (
+                            <Button type="submit" disabled={isSubmitting}>
+                                {isSubmitting ? "Menyimpan..." : modalTitle}
+                            </Button>
+                        )}
+                    </AlertDialogFooter>
+                </form>
             </AlertDialogContent>
         </AlertDialog>
     );
diff --git a/apps/frontend/src/modules/assessmentRequestManagement/modals/AssessmentRequestManagementFormModal.tsx b/apps/frontend/src/modules/assessmentRequestManagement/modals/AssessmentRequestManagementFormModal.tsx
index 9c2f94f..65471e1 100644
--- a/apps/frontend/src/modules/assessmentRequestManagement/modals/AssessmentRequestManagementFormModal.tsx
+++ b/apps/frontend/src/modules/assessmentRequestManagement/modals/AssessmentRequestManagementFormModal.tsx
@@ -198,37 +198,37 @@ export default function AssessmentRequestManagementFormModal({
 							],
 						})}
 
-						<div className="flex justify-end gap-4 mt-4">
-							<Button 
-								onClick={onClose} 
-								variant="outline" 
-								disabled={mutation.isPending}
-								className="min-w-20"
-							>
-								Tutup
-							</Button>
-							{status !== "selesai" && (
-								<>
-									<Button
-										onClick={() => handleStatusChange("ditolak")}
-										variant="destructive"
-										disabled={mutation.isPending}
-										className="min-w-20"
-									>
-										Tolak
-									</Button>
-									<Button
-										onClick={() => handleStatusChange("diterima")}
-										variant="default"
-										disabled={mutation.isPending}
-										className="min-w-20"
-									>
-										Terima
-									</Button>
-								</>
-							)}
-						</div>
 					</ScrollArea>
+					<div className="flex justify-end gap-4 mt-4">
+						<Button 
+							onClick={onClose} 
+							variant="outline" 
+							disabled={mutation.isPending}
+							className="min-w-20"
+						>
+							Tutup
+						</Button>
+						{status !== "selesai" && (
+							<>
+								<Button
+									onClick={() => handleStatusChange("ditolak")}
+									variant="destructive"
+									disabled={mutation.isPending}
+									className="min-w-20"
+								>
+									Tolak
+								</Button>
+								<Button
+									onClick={() => handleStatusChange("diterima")}
+									variant="default"
+									disabled={mutation.isPending}
+									className="min-w-20"
+								>
+									Terima
+								</Button>
+							</>
+						)}
+					</div>
 				</DialogDescription>
 			</DialogContent>
 		</Dialog>