diff --git a/apps/client/src/setup.css b/apps/client/src/setup.css
index b27c6bc9a0..07ee3c57e7 100644
--- a/apps/client/src/setup.css
+++ b/apps/client/src/setup.css
@@ -10,7 +10,7 @@ body.setup {
     margin: 0;
     padding: 0;
 
-    &>div {
+    &>.setup-outer-wrapper {
         background:
             radial-gradient(ellipse at 20% 50%, rgba(99, 102, 241, 0.3) 0%, transparent 50%),
             radial-gradient(ellipse at 80% 20%, rgba(168, 85, 247, 0.25) 0%, transparent 50%),
@@ -110,10 +110,17 @@ body.setup {
                 left: 0;
                 right: 0;
                 background: var(--admonition-caution-accent-color);
-                z-index: 10;
+                z-index: 1;
                 margin: 0;
                 border-radius: 0;
                 box-shadow: 0 4px 16px rgba(0, 0, 0, 0.1);
+                padding-right: 2.5em;
+
+                button {
+                    position: absolute;
+                    top: 0.5em;
+                    right: 0.5em;
+                }
             }
         }
 
@@ -221,6 +228,10 @@ body.setup {
         text-align: center;
         color: var(--muted-text-color);
     }
+
+    .tooltip {
+        z-index: 15 !important;
+    }
 }
 
 @keyframes lds-ring {
diff --git a/apps/client/src/setup.tsx b/apps/client/src/setup.tsx
index 25049a5fd4..cca7f7239c 100644
--- a/apps/client/src/setup.tsx
+++ b/apps/client/src/setup.tsx
@@ -8,6 +8,7 @@ import { useEffect, useRef, useState } from "preact/hooks";
 import { initLocale, t } from "./services/i18n";
 import server from "./services/server";
 import { isElectron, replaceHtmlEscapedSlashes } from "./services/utils";
+import ActionButton from "./widgets/react/ActionButton";
 import Admonition from "./widgets/react/Admonition";
 import Button from "./widgets/react/Button";
 import { Card, CardFrame, CardSection } from "./widgets/react/Card";
@@ -20,6 +21,7 @@ async function main() {
     await initLocale();
 
     const bodyWrapper = document.createElement("div");
+    bodyWrapper.classList.add("setup-outer-wrapper");
     document.body.classList.add("setup");
     render(<App />, bodyWrapper);
     document.body.replaceChildren(bodyWrapper);
@@ -221,8 +223,14 @@ function SyncFromServer({ setState }: { setState: (state: State) => void }) {
     const [ password, setPassword ] = useState("");
     const [ syncProxy, setSyncProxy ] = useState("");
     const [ error, setError ] = useState<string | null>(null);
+    const [ errorId, setErrorId ] = useState(0);
     const isValid = syncServerHost.trim() !== "" && password !== "";
 
+    function raiseError(message: string) {
+        setError(message);
+        setErrorId(id => id + 1);
+    }
+
     async function handleFinishSetup() {
         try {
             const resp = await server.post<SetupSyncFromServerResponse>("setup/sync-from-server", {
@@ -234,10 +242,10 @@ function SyncFromServer({ setState }: { setState: (state: State) => void }) {
             if (resp.result === "success") {
                 setState("syncInProgress");
             } else {
-                setError(t("setup.sync-failed", { message: resp.error }));
+                raiseError(t("setup.sync-failed", { message: resp.error }));
             }
         } catch (e) {
-            setError(e instanceof Error ? e.message : String(e));
+            raiseError(e instanceof Error ? e.message : String(e));
         }
     }
 
@@ -248,6 +256,7 @@ function SyncFromServer({ setState }: { setState: (state: State) => void }) {
             description={t("setup.sync-from-server-page-description")}
             illustration={<SyncIllustration targetDevice="server" />}
             error={error}
+            errorId={errorId}
             footer={<>
                 <Button text={t("setup.button-back")} onClick={() => setState("firstOptions")} kind="lowProfile" />
                 <Button text={t("setup.button-finish-setup")} kind="primary" onClick={handleFinishSetup} disabled={!isValid} />
@@ -344,18 +353,31 @@ function SetupOptionCard({ title, description, icon, onClick, disabled }: { titl
     );
 }
 
-function SetupPage({ title, className, illustration, children, footer, error }: {
+function SetupPage({ title, className, illustration, children, footer, error, errorId }: {
     title: string;
     description?: string;
     error?: string | null;
+    errorId?: number;
     className?: string;
     illustration?: ComponentChildren;
     children: ComponentChildren;
     footer?: ComponentChildren;
 }) {
+    const [ showError, setShowError ] = useState(!!error);
+    useEffect(() => {
+        if (error) {
+            setShowError(true);
+        }
+    }, [ error, errorId ]);
+
     return (
         <div className={clsx("page", className)}>
-            {error && <Admonition className="page-error" type="caution">{replaceHtmlEscapedSlashes(error)}</Admonition>}
+            {error && showError && (
+                <Admonition className="page-error" type="caution">
+                    <ActionButton icon="bx bx-x" text={t("setup.dismiss-error")} onClick={() => setShowError(false)}  />
+                    {replaceHtmlEscapedSlashes(error)}
+                </Admonition>
+            )}
 
             {illustration}
             <h1>{title}</h1>
diff --git a/apps/client/src/translations/en/translation.json b/apps/client/src/translations/en/translation.json
index fcdbfd7f83..5b0a3ec086 100644
--- a/apps/client/src/translations/en/translation.json
+++ b/apps/client/src/translations/en/translation.json
@@ -2270,6 +2270,7 @@
     "server-password": "Password",
     "proxy-server": "Proxy server (optional)",
     "proxy-server-placeholder": "https://<hostname>:<port>",
-    "proxy-instruction": "If you leave proxy setting blank, system proxy will be used."
+    "proxy-instruction": "If you leave proxy setting blank, system proxy will be used.",
+    "dismiss-error": "Dismiss error"
   }
 }