diff --git a/app/_components/tasks/task-dialog-skeleton.tsx b/app/_components/tasks/task-dialog-skeleton.tsx
index bb6a66b..823abb7 100644
--- a/app/_components/tasks/task-dialog-skeleton.tsx
+++ b/app/_components/tasks/task-dialog-skeleton.tsx
@@ -1,5 +1,11 @@
 import { Skeleton } from '@/components/ui/skeleton'
 import { Dialog, DialogContent, DialogTitle } from '@/components/ui/dialog'
+import {
+  entityDialogBodyClasses,
+  entityDialogContentClasses,
+  entityDialogFooterClasses,
+  entityDialogHeaderClasses,
+} from '@/components/shared/entity-dialog-layout'
 import { cn } from '@/lib/utils'
 
 export function TaskDialogSkeleton() {
@@ -8,32 +14,54 @@ export function TaskDialogSkeleton() {
       <DialogContent
         showCloseButton={false}
         className={cn(
-          'flex flex-col p-0 gap-0',
-          'max-h-[90vh] w-full max-w-[calc(100%-2rem)]',
-          'sm:max-w-[90vw] sm:max-h-[85vh]',
-          'lg:max-w-[50vw] lg:min-w-[480px]',
+          entityDialogContentClasses,
           '[animation-delay:200ms] [animation-fill-mode:backwards]',
         )}
       >
         <DialogTitle className="sr-only">Taak laden…</DialogTitle>
 
-        {/* Header */}
-        <div className="px-6 pt-5 pb-4 border-b border-outline-variant shrink-0">
-          <Skeleton className="h-7 w-40" />
+        <div className={entityDialogHeaderClasses}>
+          <div className="flex items-center gap-2">
+            <Skeleton className="h-7 w-40" />
+            <Skeleton className="h-5 w-14 rounded-full" />
+          </div>
+          <Skeleton className="h-4 w-28" />
         </div>
 
-        {/* Body — 3 bars mimicking title + description + plan */}
-        <div className="flex-1 px-6 py-6 space-y-6">
-          <Skeleton className="h-14 w-full" />
-          <Skeleton className="h-24 w-full" />
-          <Skeleton className="h-32 w-full" />
+        <div className={entityDialogBodyClasses}>
+          <div>
+            <Skeleton className="h-4 w-12 mb-2" />
+            <Skeleton className="h-9 w-full" />
+          </div>
+          <div>
+            <Skeleton className="h-4 w-12 mb-2" />
+            <Skeleton className="h-14 w-full" />
+          </div>
+          <div>
+            <Skeleton className="h-4 w-24 mb-2" />
+            <Skeleton className="h-20 w-full" />
+          </div>
+          <div>
+            <Skeleton className="h-4 w-32 mb-2" />
+            <Skeleton className="h-32 w-full" />
+          </div>
+          <div>
+            <Skeleton className="h-4 w-16 mb-2" />
+            <Skeleton className="h-9 w-64" />
+          </div>
+          <div>
+            <Skeleton className="h-4 w-12 mb-2" />
+            <Skeleton className="h-9 w-48" />
+          </div>
         </div>
 
-        {/* Footer */}
-        <div className="border-t border-outline-variant px-6 py-4 shrink-0">
-          <div className="flex justify-end gap-2">
-            <Skeleton className="h-8 w-24" />
-            <Skeleton className="h-8 w-24" />
+        <div className={entityDialogFooterClasses}>
+          <div className="flex items-center justify-between gap-2">
+            <Skeleton className="h-9 w-28" />
+            <div className="flex gap-2">
+              <Skeleton className="h-9 w-24" />
+              <Skeleton className="h-9 w-24" />
+            </div>
           </div>
         </div>
       </DialogContent>