diff --git a/frontend/src/components/dashboard/FleetDashboardShell.jsx b/frontend/src/components/dashboard/FleetDashboardShell.jsx
index 9d820a9..957e5b8 100644
--- a/frontend/src/components/dashboard/FleetDashboardShell.jsx
+++ b/frontend/src/components/dashboard/FleetDashboardShell.jsx
@@ -1364,6 +1364,10 @@ export default function FleetDashboardShell({ initialSection = 'dashboard', page
                     setServiceRecordCrane(taskCrane ?? null);
                     setServiceRecordOpen(true);
                 }}
+                onSetServiceContext={(task) => {
+                    const taskCrane = cranes.find((item) => String(item.id) === String(task?.vehicle));
+                    handleSetServiceContextForCrane(taskCrane);
+                }}
             />
         </AnimatedPage>
     );
diff --git a/frontend/src/components/dashboard/TaskServiceRecordsModal.jsx b/frontend/src/components/dashboard/TaskServiceRecordsModal.jsx
index 36d574e..4250dec 100644
--- a/frontend/src/components/dashboard/TaskServiceRecordsModal.jsx
+++ b/frontend/src/components/dashboard/TaskServiceRecordsModal.jsx
@@ -36,6 +36,7 @@ export default function TaskServiceRecordsModal({
     onAssignWorkOrder,
     onUpdateTask,
     onCreateServiceRecord,
+    onSetServiceContext,
 }) {
     const [showWorkOrderEditor, setShowWorkOrderEditor] = useState(false);
     const [selectedWorkOrderId, setSelectedWorkOrderId] = useState('');
@@ -170,14 +171,23 @@ export default function TaskServiceRecordsModal({
                                 Radni zadatak: {task.title || '-'} • Status: {getStatusLabel(task.status || '-')} • Zapisa: {records.length}
                             </p>
                         </div>
-                        <button
-                            type="button"
-                            onClick={onClose}
-                            className="rounded-md px-2 py-1 text-sm text-text-muted hover:bg-canvas-deep"
-                            aria-label="Zatvori"
-                        >
-                            ✕
-                        </button>
+                        <div className="flex items-center gap-2">
+                            <button
+                                type="button"
+                                onClick={() => onSetServiceContext?.(task)}
+                                className="btn-erp rounded-md bg-emerald-600 px-3 py-1 text-xs font-semibold normal-case tracking-normal text-white hover:bg-emerald-700"
+                            >
+                                Postavi servisni kontekst
+                            </button>
+                            <button
+                                type="button"
+                                onClick={onClose}
+                                className="rounded-md px-2 py-1 text-sm text-text-muted hover:bg-canvas-deep"
+                                aria-label="Zatvori"
+                            >
+                                ✕
+                            </button>
+                        </div>
                     </div>
 
                     <div className="max-h-[calc(100vh-12rem)] overflow-y-auto p-4">