diff --git a/frontend/src/app/dashboard/active-schedule/active-schedule.component.ts b/frontend/src/app/dashboard/active-schedule/active-schedule.component.ts
index 3328d12..69dd31c 100644
--- a/frontend/src/app/dashboard/active-schedule/active-schedule.component.ts
+++ b/frontend/src/app/dashboard/active-schedule/active-schedule.component.ts
@@ -1,6 +1,7 @@
 import {Component, EventEmitter, Input, OnInit, Output} from '@angular/core';
-import {ScheduleInfo, ScheduleService} from "../../../api";
+import {ScheduleInfo, ScheduleService, TaskOverviewInfo} from "../../../api";
 import {StopActiveScheduleInfo} from "./StopActiveScheduleInfo";
+import {TaskOverviewComponent} from "../task-overview/task-overview.component";
 
 @Component({
   selector: 'app-active-schedule',
@@ -69,5 +70,8 @@ export class ActiveScheduleComponent implements OnInit{
     this.updateTime();
   }
 
+  finishTaskByOverview(task: TaskOverviewInfo) {
+    this.activeSchedule = undefined
+  }
 
 }
diff --git a/frontend/src/app/dashboard/dashboard.component.html b/frontend/src/app/dashboard/dashboard.component.html
index 1e87e61..0213582 100644
--- a/frontend/src/app/dashboard/dashboard.component.html
+++ b/frontend/src/app/dashboard/dashboard.component.html
@@ -39,7 +39,7 @@
 
   </div>
   <div class="taskgroup-overview">
-    <app-task-overview [tasks]="tasks" (onStartNow)="onStartTaskNow($event)"></app-task-overview>
+    <app-task-overview [tasks]="tasks" (onStartNow)="onStartTaskNow($event)" (onFinished)="onFinishTask($event)"></app-task-overview>
   </div>
 
   <div class="taskgroup-overview">
diff --git a/frontend/src/app/dashboard/dashboard.component.ts b/frontend/src/app/dashboard/dashboard.component.ts
index 0749a57..3a9e648 100644
--- a/frontend/src/app/dashboard/dashboard.component.ts
+++ b/frontend/src/app/dashboard/dashboard.component.ts
@@ -56,4 +56,10 @@ export class DashboardComponent implements OnInit{
   onStartTaskNow(schedule: ScheduleInfo) {
     this.activeScheduleComponent?.activateSchedule(schedule)
   }
+
+  onFinishTask(task: TaskOverviewInfo) {
+    this.activeScheduleComponent?.finishTaskByOverview(task);
+
+    this.schedules = this.schedules.filter(schedule => schedule.task.taskID !== task.taskID)
+  }
 }
diff --git a/frontend/src/app/dashboard/task-overview/task-overview.component.ts b/frontend/src/app/dashboard/task-overview/task-overview.component.ts
index 3c0e173..ef1d591 100644
--- a/frontend/src/app/dashboard/task-overview/task-overview.component.ts
+++ b/frontend/src/app/dashboard/task-overview/task-overview.component.ts
@@ -11,6 +11,7 @@ export class TaskOverviewComponent {
 
   @Input() tasks: TaskOverviewInfo[] = []
   @Output('onStartNow') startNowEmitter: EventEmitter<ScheduleInfo> = new EventEmitter<ScheduleInfo>();
+  @Output('onFinished') finishedEmitter: EventEmitter<TaskOverviewInfo> = new EventEmitter<TaskOverviewInfo>();
 
   constructor(private scheduleService: ScheduleService,
               private snackbar: MatSnackBar,
@@ -39,7 +40,7 @@ export class TaskOverviewComponent {
   finishTask(task: TaskOverviewInfo) {
     this.taskService.tasksTaskIDFinishPost(task.taskID).subscribe({
       next: resp => {
-
+        this.finishedEmitter.emit(task);
       },
       error: err => {
         if(err.status == 403) {