diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json
index e1651cb..7a3c8f4 100644
--- a/src-tauri/tauri.conf.json
+++ b/src-tauri/tauri.conf.json
@@ -8,7 +8,7 @@
   },
   "package": {
     "productName": "Nothing",
-    "version": "1.8.0"
+    "version": "1.8.2"
   },
   "tauri": {
     "systemTray": {
diff --git a/src/app/aggregate-display/aggregate-display.component.ts b/src/app/aggregate-display/aggregate-display.component.ts
index eb90412..d8491f1 100644
--- a/src/app/aggregate-display/aggregate-display.component.ts
+++ b/src/app/aggregate-display/aggregate-display.component.ts
@@ -149,7 +149,7 @@ export class AggregateDisplayComponent {
   }
 
   currentFirst() {
-    return (this.currentAggregate?.get(this.latestEntry!.zone)?.aggregateFirstEntry) ?? 0;
+    return (this.currentAggregate?.get(this.latestEntry!.zone)?.aggregateFirstEntry) ?? this.latestEntry!.current_elapsed_millis;
   }
 
 }
diff --git a/src/app/editor/editor.component.html b/src/app/editor/editor.component.html
index d9c432a..6ed09e4 100644
--- a/src/app/editor/editor.component.html
+++ b/src/app/editor/editor.component.html
@@ -101,7 +101,4 @@
       </div>
     </div>
   </div>
-
-
-
 </div>
\ No newline at end of file
diff --git a/src/app/editor/editor.component.ts b/src/app/editor/editor.component.ts
index d8da817..7c35934 100644
--- a/src/app/editor/editor.component.ts
+++ b/src/app/editor/editor.component.ts
@@ -304,11 +304,12 @@ export class EditorComponent implements OnInit {
     const dialogRef = this.dialog.open(EditNotesComponentDialog, {
       data: {
         note: item.notes
-      }
-    })
+      },
+      disableClose: true
+    },)
 
     dialogRef.afterClosed().subscribe(note => {
-      if (note) {
+      if (note != undefined && note != null) {
         if (item.notes !== note) {
           item.edited = true;
         }
diff --git a/src/app/editor/notes/edit-notes.component.html b/src/app/editor/notes/edit-notes.component.html
index 7973f68..11dd70d 100644
--- a/src/app/editor/notes/edit-notes.component.html
+++ b/src/app/editor/notes/edit-notes.component.html
@@ -12,6 +12,6 @@
     </div>
     <div mat-dialog-actions>
         <button mat-button color="warn" (click)="cancel()">Cancel</button>
-        <button mat-button [mat-dialog-close]="note" cdkFocusInitial>Save</button>
+        <button mat-button (click)="save()" cdkFocusInitial>Save</button>
     </div>
 </div>
\ No newline at end of file
diff --git a/src/app/editor/notes/notes.component.ts b/src/app/editor/notes/notes.component.ts
index 463d8b3..3a441ad 100644
--- a/src/app/editor/notes/notes.component.ts
+++ b/src/app/editor/notes/notes.component.ts
@@ -41,7 +41,8 @@ export class NotesComponent implements AfterViewInit {
   encapsulation: ViewEncapsulation.None,
 })
 export class EditNotesComponentDialog {
-  note: string;
+  note?: string;
+
   constructor(
     public dialogRef: MatDialogRef<EditNotesComponentDialog>,
     @Inject(MAT_DIALOG_DATA) public data: DialogData,
@@ -54,6 +55,10 @@ export class EditNotesComponentDialog {
   }
 
   cancel() {
-    this.dialogRef.close();
+    this.dialogRef.close(undefined);
+  }
+
+  save() {
+    this.dialogRef.close(this.note);
   }
 }