diff --git a/AudioCuesheetEditor/Services/UI/DialogManager.cs b/AudioCuesheetEditor/Services/UI/DialogManager.cs
index cf10997f..1ebc1724 100644
--- a/AudioCuesheetEditor/Services/UI/DialogManager.cs
+++ b/AudioCuesheetEditor/Services/UI/DialogManager.cs
@@ -33,7 +33,7 @@ public async Task ShowAndHandleModalEditDialogAsync(IEnumerable<Track> tracks)
             if (tracks.Count() == 1)
             {
                 var parameters = new DialogParameters<EditTrackModal> { { x => x.EditedTrack, tracks.First().Clone() } };
-                var options = new DialogOptions() { CloseOnEscapeKey = true, BackdropClick = false, FullWidth = true };
+                var options = new DialogOptions() { CloseOnEscapeKey = true, BackdropClick = false, FullWidth = true, CloseButton = true };
                 var dialog = await _dialogService.ShowAsync<EditTrackModal>(null, parameters, options);
                 var result = await dialog.Result;
                 if ((result?.Canceled == false) && (result.Data is Track editedTrack))
@@ -44,7 +44,7 @@ public async Task ShowAndHandleModalEditDialogAsync(IEnumerable<Track> tracks)
             if (tracks.Count() > 1)
             {
                 var parameters = new DialogParameters<EditMultipleTracksModal> { { x => x.EditedTrack, new() { AutomaticallyCalculateLength = false } } };
-                var options = new DialogOptions() { CloseOnEscapeKey = true, BackdropClick = false, FullWidth = true };
+                var options = new DialogOptions() { CloseOnEscapeKey = true, BackdropClick = false, FullWidth = true, CloseButton = true };
                 var dialog = await _dialogService.ShowAsync<EditMultipleTracksModal>(null, parameters, options);
                 var result = await dialog.Result;
                 if ((result?.Canceled == false) && (result.Data is EditMultipleTracksModalResult editMultipleTracksModalResult))
diff --git a/AudioCuesheetEditor/Shared/Dialogs/EditMultipleTracksModal.de.resx b/AudioCuesheetEditor/Shared/Dialogs/EditMultipleTracksModal.de.resx
index ab6650e3..09c6ca6d 100644
--- a/AudioCuesheetEditor/Shared/Dialogs/EditMultipleTracksModal.de.resx
+++ b/AudioCuesheetEditor/Shared/Dialogs/EditMultipleTracksModal.de.resx
@@ -117,9 +117,6 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <data name="Abort" xml:space="preserve">
-    <value>Abbrechen</value>
-  </data>
   <data name="Artist" xml:space="preserve">
     <value>Künstler</value>
   </data>
diff --git a/AudioCuesheetEditor/Shared/Dialogs/EditMultipleTracksModal.razor b/AudioCuesheetEditor/Shared/Dialogs/EditMultipleTracksModal.razor
index 40e7c59e..1b00c418 100644
--- a/AudioCuesheetEditor/Shared/Dialogs/EditMultipleTracksModal.razor
+++ b/AudioCuesheetEditor/Shared/Dialogs/EditMultipleTracksModal.razor
@@ -182,7 +182,6 @@ along with Foobar.  If not, see
     </DialogContent>
     <DialogActions>
         <MudButton Color="Color.Info" Variant="Variant.Filled" OnClick="SaveClick">@_localizer["Save changes"]</MudButton>
-        <MudButton Color="Color.Error" Variant="Variant.Filled" OnClick="(args) => MudDialog?.Cancel()">@_localizer["Abort"]</MudButton>
     </DialogActions>
 </MudDialog>
 
diff --git a/AudioCuesheetEditor/Shared/Dialogs/EditMultipleTracksModal.resx b/AudioCuesheetEditor/Shared/Dialogs/EditMultipleTracksModal.resx
index be5b3c71..a0717338 100644
--- a/AudioCuesheetEditor/Shared/Dialogs/EditMultipleTracksModal.resx
+++ b/AudioCuesheetEditor/Shared/Dialogs/EditMultipleTracksModal.resx
@@ -117,9 +117,6 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <data name="Abort" xml:space="preserve">
-    <value>Abort</value>
-  </data>
   <data name="Artist" xml:space="preserve">
     <value>Artist</value>
   </data>
diff --git a/AudioCuesheetEditor/Shared/Dialogs/EditTrackModal.de.resx b/AudioCuesheetEditor/Shared/Dialogs/EditTrackModal.de.resx
index cced431a..5901db2c 100644
--- a/AudioCuesheetEditor/Shared/Dialogs/EditTrackModal.de.resx
+++ b/AudioCuesheetEditor/Shared/Dialogs/EditTrackModal.de.resx
@@ -153,7 +153,4 @@
   <data name="Save changes" xml:space="preserve">
     <value>Änderungen speichern</value>
   </data>
-  <data name="Abort" xml:space="preserve">
-    <value>Abbrechen</value>
-  </data>
 </root>
\ No newline at end of file
diff --git a/AudioCuesheetEditor/Shared/Dialogs/EditTrackModal.razor b/AudioCuesheetEditor/Shared/Dialogs/EditTrackModal.razor
index cd1199a8..14886c52 100644
--- a/AudioCuesheetEditor/Shared/Dialogs/EditTrackModal.razor
+++ b/AudioCuesheetEditor/Shared/Dialogs/EditTrackModal.razor
@@ -91,7 +91,6 @@ along with Foobar.  If not, see
     </DialogContent>
     <DialogActions>
         <MudButton Color="Color.Info" Variant="Variant.Filled" OnClick="() => MudDialog?.Close(DialogResult.Ok(EditedTrack))">@_localizer["Save changes"]</MudButton>
-        <MudButton Color="Color.Error" Variant="Variant.Filled" OnClick="(args) => MudDialog?.Cancel()">@_localizer["Abort"]</MudButton>
     </DialogActions>
 </MudDialog>
 
diff --git a/AudioCuesheetEditor/Shared/Dialogs/EditTrackModal.resx b/AudioCuesheetEditor/Shared/Dialogs/EditTrackModal.resx
index 97863bc0..7c08e3f0 100644
--- a/AudioCuesheetEditor/Shared/Dialogs/EditTrackModal.resx
+++ b/AudioCuesheetEditor/Shared/Dialogs/EditTrackModal.resx
@@ -153,7 +153,4 @@
   <data name="Save changes" xml:space="preserve">
     <value>Save changes</value>
   </data>
-  <data name="Abort" xml:space="preserve">
-    <value>Abort</value>
-  </data>
 </root>
\ No newline at end of file
diff --git a/AudioCuesheetEditor/Shared/Dialogs/StartRecordCountdownDialog.de.resx b/AudioCuesheetEditor/Shared/Dialogs/StartRecordCountdownDialog.de.resx
index bf14fe6b..2128b9f9 100644
--- a/AudioCuesheetEditor/Shared/Dialogs/StartRecordCountdownDialog.de.resx
+++ b/AudioCuesheetEditor/Shared/Dialogs/StartRecordCountdownDialog.de.resx
@@ -117,9 +117,6 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <data name="Abort" xml:space="preserve">
-    <value>Abbrechen</value>
-  </data>
   <data name="Record countdown in sconds" xml:space="preserve">
     <value>Aufnahmecountdown in Sekunden</value>
   </data>
diff --git a/AudioCuesheetEditor/Shared/Dialogs/StartRecordCountdownDialog.razor b/AudioCuesheetEditor/Shared/Dialogs/StartRecordCountdownDialog.razor
index b39123d6..1bccb8c9 100644
--- a/AudioCuesheetEditor/Shared/Dialogs/StartRecordCountdownDialog.razor
+++ b/AudioCuesheetEditor/Shared/Dialogs/StartRecordCountdownDialog.razor
@@ -29,7 +29,6 @@ along with Foobar.  If not, see
     </DialogContent>
     <DialogActions>
         <MudButton Color="Color.Primary" Variant="Variant.Filled" StartIcon="@Icons.Material.Outlined.Timer" OnClick="() => MudDialog?.Close(DialogResult.Ok(options?.RecordCountdownTimer))">@_localizer["Start countdown"]</MudButton>
-        <MudButton Color="Color.Error" Variant="Variant.Filled" OnClick="() => MudDialog?.Cancel()">@_localizer["Abort"]</MudButton>
     </DialogActions>
 </MudDialog>
 
diff --git a/AudioCuesheetEditor/Shared/Dialogs/StartRecordCountdownDialog.resx b/AudioCuesheetEditor/Shared/Dialogs/StartRecordCountdownDialog.resx
index beb8b8e3..d829f469 100644
--- a/AudioCuesheetEditor/Shared/Dialogs/StartRecordCountdownDialog.resx
+++ b/AudioCuesheetEditor/Shared/Dialogs/StartRecordCountdownDialog.resx
@@ -117,9 +117,6 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <data name="Abort" xml:space="preserve">
-    <value>Abort</value>
-  </data>
   <data name="Record countdown in sconds" xml:space="preserve">
     <value>Record countdown in sconds</value>
   </data>
diff --git a/AudioCuesheetEditor/Shared/Record/ControlRecording.razor b/AudioCuesheetEditor/Shared/Record/ControlRecording.razor
index 204ba4ce..0d605db8 100644
--- a/AudioCuesheetEditor/Shared/Record/ControlRecording.razor
+++ b/AudioCuesheetEditor/Shared/Record/ControlRecording.razor
@@ -137,7 +137,7 @@ along with Foobar.  If not, see
 
     async Task DisplayStartCountdownDialog()
     {
-        var options = new DialogOptions() { CloseOnEscapeKey = true, BackdropClick = false };
+        var options = new DialogOptions() { CloseOnEscapeKey = true, BackdropClick = false, CloseButton = true };
         var dialog = await _dialogService.ShowAsync<StartRecordCountdownDialog>(null, options);
         var result = await dialog.Result;
         var recordCountdownTimer = result?.Data as uint?;