diff --git a/server/pages/pages_surfaces.go b/server/pages/pages_surfaces.go
index 68f8655..a3e7088 100644
--- a/server/pages/pages_surfaces.go
+++ b/server/pages/pages_surfaces.go
@@ -129,14 +129,17 @@ func (e *Engine) resolveDefaultSurface(ctx context.Context, userID string) strin
 		}
 	}
 
-	// 3. First enabled extension surface
-	surfaces, err := e.stores.Packages.ListEnabledByType(ctx, "surface")
+	// 3. First enabled extension surface (type "surface" or "full")
+	allPkgs, err := e.stores.Packages.List(ctx)
 	if err == nil {
-		for _, s := range surfaces {
-			if s.Source == "core" {
+		for _, s := range allPkgs {
+			if s.Source == "core" || s.Source == "builtin" {
 				continue
 			}
-			if s.Enabled {
+			if !s.Enabled {
+				continue
+			}
+			if s.Type == "surface" || s.Type == "full" {
 				return "/s/" + s.ID
 			}
 		}
diff --git a/src/js/sw/surfaces/welcome/index.js b/src/js/sw/surfaces/welcome/index.js
index 0767e2e..be9fa7d 100644
--- a/src/js/sw/surfaces/welcome/index.js
+++ b/src/js/sw/surfaces/welcome/index.js
@@ -1,8 +1,10 @@
 /**
- * WelcomeSurface — shown when no extension surfaces are installed.
- * Renders Topbar + a getting-started card with link to admin.
+ * WelcomeSurface — fallback landing page.
+ * Shown when no default surface is configured or no extensions are installed.
+ * Checks for available extension surfaces and adjusts messaging.
  */
 const { html } = window;
+const { useState, useEffect } = hooks;
 const { render } = preact;
 
 import { Topbar } from '../../shell/topbar.js';
@@ -10,27 +12,49 @@ import { Topbar } from '../../shell/topbar.js';
 function WelcomeSurface() {
     const BASE = window.__BASE__ || '';
     const isAdmin = sw.can?.('surface.admin.access');
+    const [surfaces, setSurfaces] = useState([]);
+
+    useEffect(() => {
+        sw.api.get('/api/v1/surfaces').then(list => {
+            setSurfaces((list || []).filter(s => s.source !== 'core'));
+        }).catch(() => {});
+    }, []);
+
+    const hasSurfaces = surfaces.length > 0;
 
     return html`
         <${Topbar} title="Switchboard" />
         <div style="flex:1;display:flex;align-items:center;justify-content:center;padding:24px;">
             <div style="max-width:420px;width:100%;background:var(--bg-surface);border:1px solid var(--border);border-radius:12px;padding:32px;text-align:center;">
-                <div style="font-size:36px;margin-bottom:16px;">📦</div>
+                <div style="font-size:36px;margin-bottom:16px;">${hasSurfaces ? '🏠' : '📦'}</div>
                 <h2 style="font-size:20px;font-weight:600;margin:0 0 8px;">Welcome to Switchboard</h2>
-                <p style="font-size:14px;color:var(--text-2);margin:0 0 24px;line-height:1.5;">
-                    No surfaces are installed yet. Install an extension surface
-                    to get started.
-                </p>
-                ${isAdmin && html`
-                    <a href="${BASE}/admin/packages"
-                       style="display:inline-flex;align-items:center;gap:8px;padding:10px 24px;background:var(--accent);color:#fff;border-radius:8px;text-decoration:none;font-weight:600;font-size:14px;">
-                        Go to Packages
-                    </a>
-                `}
-                ${!isAdmin && html`
-                    <p style="font-size:13px;color:var(--text-3);">
-                        Ask your administrator to install a surface package.
+                ${hasSurfaces ? html`
+                    <p style="font-size:14px;color:var(--text-2);margin:0 0 24px;line-height:1.5;">
+                        No default surface is configured. Choose a surface from
+                        the menu, or ${isAdmin ? 'set a default in admin settings.' : 'ask your administrator to set a default.'}
                     </p>
+                    ${isAdmin && html`
+                        <a href="${BASE}/admin/settings"
+                           style="display:inline-flex;align-items:center;gap:8px;padding:10px 24px;background:var(--accent);color:#fff;border-radius:8px;text-decoration:none;font-weight:600;font-size:14px;">
+                            Set Default Surface
+                        </a>
+                    `}
+                ` : html`
+                    <p style="font-size:14px;color:var(--text-2);margin:0 0 24px;line-height:1.5;">
+                        No surfaces are installed yet. Install an extension surface
+                        to get started.
+                    </p>
+                    ${isAdmin && html`
+                        <a href="${BASE}/admin/packages"
+                           style="display:inline-flex;align-items:center;gap:8px;padding:10px 24px;background:var(--accent);color:#fff;border-radius:8px;text-decoration:none;font-weight:600;font-size:14px;">
+                            Go to Packages
+                        </a>
+                    `}
+                    ${!isAdmin && html`
+                        <p style="font-size:13px;color:var(--text-3);">
+                            Ask your administrator to install a surface package.
+                        </p>
+                    `}
                 `}
             </div>
         </div>