diff --git a/src/Duempelkas.App/Components/Dialogs/AddAccountDialog.razor b/src/Duempelkas.App/Components/Dialogs/AddAccountDialog.razor
index 5444265..e0200a9 100644
--- a/src/Duempelkas.App/Components/Dialogs/AddAccountDialog.razor
+++ b/src/Duempelkas.App/Components/Dialogs/AddAccountDialog.razor
@@ -1,4 +1,4 @@
-<div class="dialog-backdrop" @onclick="Cancel">
+<div class="dialog-backdrop">
     <div class="dialog-content" @onclick:stopPropagation="true">
         <h5 class="mb-3">Neues Konto</h5>
         <div class="form-container">
diff --git a/src/Duempelkas.App/Components/Dialogs/AddEntryDialog.razor b/src/Duempelkas.App/Components/Dialogs/AddEntryDialog.razor
index 09b44b3..2258098 100644
--- a/src/Duempelkas.App/Components/Dialogs/AddEntryDialog.razor
+++ b/src/Duempelkas.App/Components/Dialogs/AddEntryDialog.razor
@@ -1,6 +1,6 @@
 @inject IEntryService EntryService
 
-<div class="dialog-backdrop" @onclick="Cancel">
+<div class="dialog-backdrop">
     <div class="dialog-content" @onclick:stopPropagation="true">
         <h5>@(EditEntry != null ? "Buchung bearbeiten" : "Neue Buchung")</h5>
 
diff --git a/src/Duempelkas.App/Components/Dialogs/AddTransferDialog.razor b/src/Duempelkas.App/Components/Dialogs/AddTransferDialog.razor
index 448d375..150f00d 100644
--- a/src/Duempelkas.App/Components/Dialogs/AddTransferDialog.razor
+++ b/src/Duempelkas.App/Components/Dialogs/AddTransferDialog.razor
@@ -1,7 +1,7 @@
 @inject IEntryService EntryService
 @inject IAccountService AccountService
 
-<div class="dialog-backdrop" @onclick="Cancel">
+<div class="dialog-backdrop">
     <div class="dialog-content" @onclick:stopPropagation="true">
         <h5 class="mb-3">@(EditEntry != null ? "Umbuchung bearbeiten" : "Neue Umbuchung")</h5>
 
diff --git a/src/Duempelkas.App/Components/Dialogs/ConfirmDialog.razor b/src/Duempelkas.App/Components/Dialogs/ConfirmDialog.razor
index 1d45d78..6f36c13 100644
--- a/src/Duempelkas.App/Components/Dialogs/ConfirmDialog.razor
+++ b/src/Duempelkas.App/Components/Dialogs/ConfirmDialog.razor
@@ -1,4 +1,4 @@
-<div class="dialog-backdrop" @onclick="Cancel">
+<div class="dialog-backdrop">
     <div class="dialog-content" @onclick:stopPropagation="true">
         <h5>@Title</h5>
         <p>@Message</p>
diff --git a/src/Duempelkas.App/Components/Dialogs/EditCarryoverDialog.razor b/src/Duempelkas.App/Components/Dialogs/EditCarryoverDialog.razor
index a82725b..2f8f97a 100644
--- a/src/Duempelkas.App/Components/Dialogs/EditCarryoverDialog.razor
+++ b/src/Duempelkas.App/Components/Dialogs/EditCarryoverDialog.razor
@@ -1,4 +1,4 @@
-<div class="dialog-backdrop" @onclick="Cancel">
+<div class="dialog-backdrop">
     <div class="dialog-content" @onclick:stopPropagation="true">
         <h5 class="mb-3">Übertrag bearbeiten</h5>
         <div class="form-container">
diff --git a/src/Duempelkas.App/Components/Dialogs/EditNameDialog.razor b/src/Duempelkas.App/Components/Dialogs/EditNameDialog.razor
index a821d22..f66ca09 100644
--- a/src/Duempelkas.App/Components/Dialogs/EditNameDialog.razor
+++ b/src/Duempelkas.App/Components/Dialogs/EditNameDialog.razor
@@ -1,4 +1,4 @@
-<div class="dialog-backdrop" @onclick="Cancel">
+<div class="dialog-backdrop">
     <div class="dialog-content" @onclick:stopPropagation="true">
         <h5 class="mb-3">@DialogTitle</h5>
         <div class="form-container">
diff --git a/src/Duempelkas.App/Components/Layout/MainLayout.razor b/src/Duempelkas.App/Components/Layout/MainLayout.razor
index 16c7827..c67155a 100644
--- a/src/Duempelkas.App/Components/Layout/MainLayout.razor
+++ b/src/Duempelkas.App/Components/Layout/MainLayout.razor
@@ -19,7 +19,7 @@
 
 @if (showAboutDialog)
 {
-    <div class="dialog-backdrop" @onclick="CloseAboutDialog">
+    <div class="dialog-backdrop">
         <div class="dialog-content" @onclick:stopPropagation="true">
             <h5>Über Dümpelkas &middot; Version @AppVersion</h5>
             <p class="mb-2">Entwickler: Andre Beging</p>
diff --git a/src/Duempelkas.App/Pages/Dashboard.razor b/src/Duempelkas.App/Pages/Dashboard.razor
index 2358eca..498b1be 100644
--- a/src/Duempelkas.App/Pages/Dashboard.razor
+++ b/src/Duempelkas.App/Pages/Dashboard.razor
@@ -4,7 +4,6 @@
 @inject ISettingsService SettingsService
 @inject IPdfStatementService PdfStatementService
 @inject IFileSaveService FileSaveService
-@inject IJSRuntime JsRuntime
 @inject NavigationManager NavigationManager
 @using System.Globalization
 
@@ -97,10 +96,23 @@
                    OnCancel="CancelOpenSavedPdf" />
 }
 
+@if (showRestoreConfirm)
+{
+    <ConfirmDialog Title="Restore bestätigen"
+                   Message="Restore überschreibt die aktuelle Datenbank. Möchten Sie fortfahren?"
+                   ConfirmText="Ja, wiederherstellen"
+                   CancelText="Nein, abbrechen"
+                   ConfirmButtonClass="btn btn-warning"
+                   ConfirmIconClass="bi bi-arrow-counterclockwise"
+                   OnConfirm="HandleConfirmRestore"
+                   OnCancel="CancelRestoreConfirm" />
+}
+
 @code {
     private List<AccountSummaryDto>? accounts;
     private bool showAddAccount;
     private bool showEditClubName;
+    private bool showRestoreConfirm;
     private string clubName = string.Empty;
     private string? operationMessage;
     private string operationMessageClass = "alert-info";
@@ -147,13 +159,20 @@
         
     }
 
-    private async Task HandleRestoreAsync()
+    private Task HandleRestoreAsync()
     {
-        var confirmed = await JsRuntime.InvokeAsync<bool>("confirm",
-            "Restore überschreibt die aktuelle Datenbank. Möchten Sie fortfahren?");
+        showRestoreConfirm = true;
+        return Task.CompletedTask;
+    }
 
-        if (!confirmed) return;
+    private void CancelRestoreConfirm()
+    {
+        showRestoreConfirm = false;
+    }
 
+    private async Task HandleConfirmRestore()
+    {
+        showRestoreConfirm = false;
         var message = await BackupService.RestoreBackupAsync();
         var isSuccess = message.StartsWith("Wiederherstellung erfolgreich", StringComparison.OrdinalIgnoreCase);
 
@@ -164,7 +183,6 @@
         } else {
             SetOperationMessage(message, isSuccess);
         }
-
     }
 
     private async Task HandleDashboardExportAsync()