diff --git a/frontend/src/components/dashboard/WorkOrderInvoicesPdfPage.jsx b/frontend/src/components/dashboard/WorkOrderInvoicesPdfPage.jsx
index edb9df8..a0c946e 100644
--- a/frontend/src/components/dashboard/WorkOrderInvoicesPdfPage.jsx
+++ b/frontend/src/components/dashboard/WorkOrderInvoicesPdfPage.jsx
@@ -231,14 +231,28 @@ export default function WorkOrderInvoicesPdfPage() {
             <div className="rounded-xl border border-border-hairline bg-canvas-elevated p-4">
                 <div className="mb-3 flex flex-wrap items-center justify-between gap-2">
                     <h2 className="text-lg font-semibold text-text-main">Servisni zapisi</h2>
-                    <button
-                        type="button"
-                        onClick={() => downloadWorkOrderServiceRecordsPdf(workOrderId)}
-                        disabled={!workOrderId}
-                        className="rounded-lg bg-indigo-600 px-4 py-2 text-sm font-semibold text-white hover:bg-indigo-700 disabled:opacity-60"
-                    >
-                        Preuzmi PDF servisnih zapisa
-                    </button>
+                    <div className="flex flex-wrap items-center gap-2">
+                        <button
+                            type="button"
+                            onClick={() => {
+                                const firstTask = Array.isArray(taskContext.tasks) ? taskContext.tasks[0] : null;
+                                if (!firstTask) return;
+                                setEditingTask(firstTask);
+                            }}
+                            disabled={!Array.isArray(taskContext.tasks) || taskContext.tasks.length === 0}
+                            className="rounded-lg border border-border-hairline px-4 py-2 text-sm font-semibold text-text-main hover:bg-canvas-deep disabled:opacity-60"
+                        >
+                            Uredi tablicu radnih sati
+                        </button>
+                        <button
+                            type="button"
+                            onClick={() => downloadWorkOrderServiceRecordsPdf(workOrderId)}
+                            disabled={!workOrderId}
+                            className="rounded-lg bg-indigo-600 px-4 py-2 text-sm font-semibold text-white hover:bg-indigo-700 disabled:opacity-60"
+                        >
+                            Preuzmi PDF servisnih zapisa
+                        </button>
+                    </div>
                 </div>
                 {loading && <p className="text-sm text-text-muted">Učitavanje task konteksta...</p>}
                 {!loading && !error && (!Array.isArray(taskContext.tasks) || taskContext.tasks.length === 0) && (
@@ -254,15 +268,6 @@ export default function WorkOrderInvoicesPdfPage() {
                                     <div><span className="font-semibold">Dodijeljeno:</span> {task.assigned_to_name || '-'}</div>
                                     <div><span className="font-semibold">Dizalica:</span> {task.vehicle_registration || '-'}</div>
                                 </div>
-                                <div className="mt-2">
-                                    <button
-                                        type="button"
-                                        onClick={() => setEditingTask(task)}
-                                        className="rounded-md border border-border-hairline px-3 py-1.5 text-xs font-medium text-text-main hover:bg-canvas-deep"
-                                    >
-                                        Uredi tablicu radnih sati
-                                    </button>
-                                </div>
                                 <div className="mt-3 space-y-3">
                                     {!Array.isArray(task.service_records) || task.service_records.length === 0 ? (
                                         <p className="text-xs text-text-muted">Nema povezanih servisnih zapisa.</p>