diff --git a/desktop/src-tauri/tauri.conf.json b/desktop/src-tauri/tauri.conf.json
index 80c24ddf..0224416a 100644
--- a/desktop/src-tauri/tauri.conf.json
+++ b/desktop/src-tauri/tauri.conf.json
@@ -13,10 +13,10 @@
     "windows": [
       {
         "title": "Claude Code Haha",
-        "width": 1280,
-        "height": 800,
-        "minWidth": 900,
-        "minHeight": 600,
+        "width": 1440,
+        "height": 960,
+        "minWidth": 960,
+        "minHeight": 640,
         "decorations": true,
         "titleBarStyle": "Overlay",
         "hiddenTitle": true,
diff --git a/desktop/src/pages/ActiveSession.tsx b/desktop/src/pages/ActiveSession.tsx
index 2df707dc..3aeb1eeb 100644
--- a/desktop/src/pages/ActiveSession.tsx
+++ b/desktop/src/pages/ActiveSession.tsx
@@ -3,6 +3,7 @@ import { useTabStore } from '../stores/tabStore'
 import { useSessionStore } from '../stores/sessionStore'
 import { useChatStore } from '../stores/chatStore'
 import { useCLITaskStore } from '../stores/cliTaskStore'
+import { useTranslation } from '../i18n'
 import { MessageList } from '../components/chat/MessageList'
 import { ChatInput } from '../components/chat/ChatInput'
 import { TeamStatusBar } from '../components/teams/TeamStatusBar'
@@ -53,6 +54,11 @@ export function ActiveSession() {
     fetchSessionTasks,
   ])
 
+  const t = useTranslation()
+  const messages = sessionState?.messages ?? []
+  const streamingText = sessionState?.streamingText ?? ''
+  const isEmpty = messages.length === 0 && !streamingText
+
   const isActive = chatState !== 'idle'
   const totalTokens = tokenUsage.input_tokens + tokenUsage.output_tokens
 
@@ -69,51 +75,68 @@ export function ActiveSession() {
 
   return (
     <div className="flex-1 flex flex-col relative overflow-hidden bg-background text-on-surface">
-      {/* Session info header */}
-      <div className="mx-auto flex w-full max-w-[860px] items-center border-b border-outline-variant/10 px-8 py-3">
-        <div className="flex-1">
-          <h1 className="text-lg font-bold font-headline text-on-surface leading-tight">
-            {session?.title || 'Untitled Session'}
-          </h1>
-          <div className="flex items-center gap-2 text-[10px] text-outline font-medium mt-1">
-            {isActive && (
-              <span className="flex items-center gap-1">
-                <span className="w-1.5 h-1.5 rounded-full bg-[var(--color-success)] animate-pulse-dot" />
-                session active
-              </span>
-            )}
-            {totalTokens > 0 && (
-              <>
-                <span className="text-[var(--color-outline)]">·</span>
-                <span>{totalTokens.toLocaleString()} t</span>
-              </>
-            )}
-            {lastUpdated && (
-              <>
-                <span className="text-[var(--color-outline)]">·</span>
-                <span>last updated {lastUpdated}</span>
-              </>
-            )}
-            {session?.messageCount !== undefined && session.messageCount > 0 && (
-              <>
-                <span className="text-[var(--color-outline)]">·</span>
-                <span>{session.messageCount} messages</span>
-              </>
-            )}
+      {isEmpty ? (
+        /* Welcome hero — same look as EmptySession */
+        <div className="flex flex-1 flex-col items-center justify-center p-8 pb-32">
+          <div className="flex max-w-md flex-col items-center text-center">
+            <img src="/app-icon.jpg" alt="Claude Code Haha" className="mb-6 h-24 w-24 rounded-[22px] shadow-[0_2px_12px_rgba(0,0,0,0.06)]" />
+            <h1 className="mb-2 text-3xl font-extrabold tracking-tight text-[var(--color-text-primary)]" style={{ fontFamily: "'Manrope', sans-serif" }}>
+              {t('empty.title')}
+            </h1>
+            <p className="mx-auto max-w-xs text-[var(--color-text-secondary)]" style={{ fontFamily: "'Inter', sans-serif" }}>
+              {t('empty.subtitle')}
+            </p>
           </div>
-          {session?.workDirExists === false && (
-            <div className="mt-2 inline-flex max-w-full items-center gap-2 rounded-lg border border-[var(--color-error)]/20 bg-[var(--color-error)]/8 px-3 py-1.5 text-[11px] text-[var(--color-error)]">
-              <span className="material-symbols-outlined text-[14px]">warning</span>
-              <span className="truncate">
-                Workspace unavailable: {session.workDir || 'directory no longer exists'}
-              </span>
-            </div>
-          )}
         </div>
-      </div>
+      ) : (
+        <>
+          {/* Session info header */}
+          <div className="mx-auto flex w-full max-w-[860px] items-center border-b border-outline-variant/10 px-8 py-3">
+            <div className="flex-1">
+              <h1 className="text-lg font-bold font-headline text-on-surface leading-tight">
+                {session?.title || 'Untitled Session'}
+              </h1>
+              <div className="flex items-center gap-2 text-[10px] text-outline font-medium mt-1">
+                {isActive && (
+                  <span className="flex items-center gap-1">
+                    <span className="w-1.5 h-1.5 rounded-full bg-[var(--color-success)] animate-pulse-dot" />
+                    session active
+                  </span>
+                )}
+                {totalTokens > 0 && (
+                  <>
+                    <span className="text-[var(--color-outline)]">·</span>
+                    <span>{totalTokens.toLocaleString()} t</span>
+                  </>
+                )}
+                {lastUpdated && (
+                  <>
+                    <span className="text-[var(--color-outline)]">·</span>
+                    <span>last updated {lastUpdated}</span>
+                  </>
+                )}
+                {session?.messageCount !== undefined && session.messageCount > 0 && (
+                  <>
+                    <span className="text-[var(--color-outline)]">·</span>
+                    <span>{session.messageCount} messages</span>
+                  </>
+                )}
+              </div>
+              {session?.workDirExists === false && (
+                <div className="mt-2 inline-flex max-w-full items-center gap-2 rounded-lg border border-[var(--color-error)]/20 bg-[var(--color-error)]/8 px-3 py-1.5 text-[11px] text-[var(--color-error)]">
+                  <span className="material-symbols-outlined text-[14px]">warning</span>
+                  <span className="truncate">
+                    Workspace unavailable: {session.workDir || 'directory no longer exists'}
+                  </span>
+                </div>
+              )}
+            </div>
+          </div>
 
-      {/* Message stream */}
-      <MessageList />
+          {/* Message stream */}
+          <MessageList />
+        </>
+      )}
 
       {/* Session task bar — sticky at bottom */}
       <SessionTaskBar />