diff --git a/server/backend/internal/httpapi/manage/templates.go b/server/backend/internal/httpapi/manage/templates.go
index ddac2f1..c4c40f3 100644
--- a/server/backend/internal/httpapi/manage/templates.go
+++ b/server/backend/internal/httpapi/manage/templates.go
@@ -530,7 +530,7 @@ const manageTmpl = `<!DOCTYPE html>
 
 <nav class="navbar is-dark" role="navigation" aria-label="main navigation">
   <div class="navbar-brand">
-    <a class="navbar-item" href="/admin">← Admin</a>
+    <a class="navbar-item" href="{{.BackLink}}">{{.BackLabel}}</a>
     <span class="navbar-item">
       <strong>{{.Screen.Name}}</strong>
       &nbsp;
diff --git a/server/backend/internal/httpapi/manage/ui.go b/server/backend/internal/httpapi/manage/ui.go
index f88fc8d..eda026a 100644
--- a/server/backend/internal/httpapi/manage/ui.go
+++ b/server/backend/internal/httpapi/manage/ui.go
@@ -125,6 +125,20 @@ func HandleManageUI(
 			}
 		}
 
+		// Determine back-navigation based on ?from= query parameter.
+		backLink := "/admin"
+		backLabel := "← Admin"
+		if r.URL.Query().Get("from") == "tenant" {
+			tenantSlug := ""
+			if u := reqcontext.UserFromContext(r.Context()); u != nil && u.TenantSlug != "" {
+				tenantSlug = u.TenantSlug
+			}
+			if tenantSlug != "" {
+				backLink = "/tenant/" + tenantSlug + "/dashboard"
+				backLabel = "← Dashboard"
+			}
+		}
+
 		w.Header().Set("Content-Type", "text/html; charset=utf-8")
 		t.Execute(w, map[string]any{ //nolint:errcheck
 			"Screen":      screen,
@@ -133,6 +147,8 @@ func HandleManageUI(
 			"Items":       items,
 			"Assets":      assets,
 			"AddedAssets": addedAssets,
+			"BackLink":    backLink,
+			"BackLabel":   backLabel,
 		})
 	}
 }
