diff --git a/lang/es.json b/lang/es.json
index 3f03695b..c49c1a1f 100644
--- a/lang/es.json
+++ b/lang/es.json
@@ -2229,5 +2229,8 @@
     "Switch": "Cambiar",
     "Rename": "Renombrar",
     "Rename space": "Renombrar espacio",
-    "Remove or move this space's accounts before deleting it.": "Elimina o mueve las cuentas de este espacio antes de borrarlo."
+    "Remove or move this space's accounts before deleting it.": "Elimina o mueve las cuentas de este espacio antes de borrarlo.",
+    "Spaces settings": "Configuración de espacios",
+    "Delete space": "Eliminar espacio",
+    "This space has no accounts yet.": "Este espacio aún no tiene cuentas."
 }
diff --git a/resources/js/pages/dashboard.tsx b/resources/js/pages/dashboard.tsx
index 50942758..a528fe8a 100644
--- a/resources/js/pages/dashboard.tsx
+++ b/resources/js/pages/dashboard.tsx
@@ -311,21 +311,27 @@ export default function Dashboard() {
                         )}
                     </div>
 
-                    <div className="grid gap-4 md:grid-cols-2">
-                        {gridAccounts.map((account) => (
-                            <AccountBalanceCard
-                                key={account.id}
-                                account={account}
-                                onBalanceUpdated={refetch}
-                                linkedLoanMetrics={
-                                    linkedLoanMetricsMap[account.id]
-                                }
-                                displayCurrencyCode={
-                                    netWorthEvolution.currency_code
-                                }
-                            />
-                        ))}
-                    </div>
+                    {gridAccounts.length === 0 ? (
+                        <p className="rounded-lg border border-dashed border-border py-8 text-center text-sm text-muted-foreground">
+                            {__('This space has no accounts yet.')}
+                        </p>
+                    ) : (
+                        <div className="grid gap-4 md:grid-cols-2">
+                            {gridAccounts.map((account) => (
+                                <AccountBalanceCard
+                                    key={account.id}
+                                    account={account}
+                                    onBalanceUpdated={refetch}
+                                    linkedLoanMetrics={
+                                        linkedLoanMetricsMap[account.id]
+                                    }
+                                    displayCurrencyCode={
+                                        netWorthEvolution.currency_code
+                                    }
+                                />
+                            ))}
+                        </div>
+                    )}
 
                     <AccountsManagerDialog
                         open={editOpen}
diff --git a/resources/js/pages/settings/spaces.tsx b/resources/js/pages/settings/spaces.tsx
index 7200a036..e4d2e748 100644
--- a/resources/js/pages/settings/spaces.tsx
+++ b/resources/js/pages/settings/spaces.tsx
@@ -6,6 +6,16 @@ import {
     update as updateSpace,
 } from '@/actions/App/Http/Controllers/SpaceController';
 import HeadingSmall from '@/components/heading-small';
+import {
+    AlertDialog,
+    AlertDialogAction,
+    AlertDialogCancel,
+    AlertDialogContent,
+    AlertDialogDescription,
+    AlertDialogFooter,
+    AlertDialogHeader,
+    AlertDialogTitle,
+} from '@/components/ui/alert-dialog';
 import { Button } from '@/components/ui/button';
 import {
     Dialog,
@@ -36,6 +46,7 @@ export default function Spaces() {
     const { spaces, currentSpace } = usePage<SharedData>().props;
     const [createOpen, setCreateOpen] = useState(false);
     const [renaming, setRenaming] = useState<Space | null>(null);
+    const [deleting, setDeleting] = useState<Space | null>(null);
     const [name, setName] = useState('');
     const [processing, setProcessing] = useState(false);
 
@@ -73,16 +84,16 @@ export default function Spaces() {
         );
     };
 
-    const remove = (space: Space) => {
-        if (
-            !window.confirm(
-                __('Delete this space? This cannot be undone.') +
-                    ` (${space.name})`,
-            )
-        ) {
+    const confirmDelete = () => {
+        if (!deleting) {
             return;
         }
-        router.delete(destroySpace(space.id).url, { preserveScroll: true });
+        setProcessing(true);
+        router.delete(destroySpace(deleting.id).url, {
+            preserveScroll: true,
+            onFinish: () => setProcessing(false),
+            onSuccess: () => setDeleting(null),
+        });
     };
 
     return (
@@ -169,7 +180,7 @@ export default function Spaces() {
                                                     size="sm"
                                                     className="text-destructive hover:text-destructive"
                                                     onClick={() =>
-                                                        remove(space)
+                                                        setDeleting(space)
                                                     }
                                                 >
                                                     {__('Delete')}
@@ -270,6 +281,35 @@ export default function Spaces() {
                     </form>
                 </DialogContent>
             </Dialog>
+
+            <AlertDialog
+                open={deleting !== null}
+                onOpenChange={(open) => !open && setDeleting(null)}
+            >
+                <AlertDialogContent>
+                    <AlertDialogHeader>
+                        <AlertDialogTitle>
+                            {__('Delete space')}
+                        </AlertDialogTitle>
+                        <AlertDialogDescription>
+                            {__('Delete this space? This cannot be undone.')}
+                            {deleting ? ` (${deleting.name})` : ''}
+                        </AlertDialogDescription>
+                    </AlertDialogHeader>
+                    <AlertDialogFooter>
+                        <AlertDialogCancel disabled={processing}>
+                            {__('Cancel')}
+                        </AlertDialogCancel>
+                        <AlertDialogAction
+                            onClick={confirmDelete}
+                            disabled={processing}
+                            variant="destructive"
+                        >
+                            {__('Delete')}
+                        </AlertDialogAction>
+                    </AlertDialogFooter>
+                </AlertDialogContent>
+            </AlertDialog>
         </AppLayout>
     );
 }