diff --git a/ui-ngx/src/app/shared/components/time/timewindow-panel.component.html b/ui-ngx/src/app/shared/components/time/timewindow-panel.component.html
index 57ccc75842..8e1a05d031 100644
--- a/ui-ngx/src/app/shared/components/time/timewindow-panel.component.html
+++ b/ui-ngx/src/app/shared/components/time/timewindow-panel.component.html
@@ -17,8 +17,7 @@
 -->
 <form [formGroup]="timewindowForm" class="mat-content">
   <mat-tab-group [ngClass]="{'tb-headless': historyOnly}"
-                 (selectedIndexChange)="timewindowForm.markAsDirty()" [(selectedIndex)]="timewindow.selectedTab"
-                 (selectedTabChange)="onTimewindowTypeChange()">
+                 (selectedTabChange)="onTimewindowTypeChange()" [(selectedIndex)]="timewindow.selectedTab">
     <mat-tab label="{{ 'timewindow.realtime' | translate }}">
       <section fxLayout="row">
         <section *ngIf="isEdit" fxLayout="column" fxLayoutAlign="start center"
diff --git a/ui-ngx/src/app/shared/components/time/timewindow-panel.component.ts b/ui-ngx/src/app/shared/components/time/timewindow-panel.component.ts
index cdcb5bd449..3610317855 100644
--- a/ui-ngx/src/app/shared/components/time/timewindow-panel.component.ts
+++ b/ui-ngx/src/app/shared/components/time/timewindow-panel.component.ts
@@ -188,6 +188,7 @@ export class TimewindowPanelComponent extends PageComponent implements OnInit {
   }
 
   onTimewindowTypeChange() {
+    this.timewindowForm.markAsDirty();
     const timewindowFormValue = this.timewindowForm.getRawValue();
     if (this.timewindow.selectedTab === TimewindowType.REALTIME) {
       this.timewindowForm.get('realtime').patchValue({