diff --git a/packages/vscode-ide-companion/src/WebViewProvider.ts b/packages/vscode-ide-companion/src/WebViewProvider.ts
index fc12de65..b73b3f73 100644
--- a/packages/vscode-ide-companion/src/WebViewProvider.ts
+++ b/packages/vscode-ide-companion/src/WebViewProvider.ts
@@ -364,6 +364,20 @@ export class WebViewProvider {
     // Register dispose handler
     this.panelManager.registerDisposeHandler(this.disposables);
 
+    // Listen for active editor changes and notify WebView
+    const editorChangeDisposable = vscode.window.onDidChangeActiveTextEditor(
+      (editor) => {
+        const fileName = editor?.document.uri.fsPath
+          ? getFileName(editor.document.uri.fsPath)
+          : null;
+        this.sendMessageToWebView({
+          type: 'activeEditorChanged',
+          data: { fileName },
+        });
+      },
+    );
+    this.disposables.push(editorChangeDisposable);
+
     // Capture the tab reference on restore
     this.panelManager.captureTab();
 
diff --git a/packages/vscode-ide-companion/src/extension.ts b/packages/vscode-ide-companion/src/extension.ts
index f8501c22..1c03ca60 100644
--- a/packages/vscode-ide-companion/src/extension.ts
+++ b/packages/vscode-ide-companion/src/extension.ts
@@ -189,17 +189,10 @@ export async function activate(context: vscode.ExtensionContext) {
       }
     }),
     vscode.commands.registerCommand('qwenCode.openNewChatTab', () => {
-      // Check if there's already an open chat panel
-      if (webViewProviders.length > 0) {
-        const lastProvider = webViewProviders[webViewProviders.length - 1];
-        // Reveal the existing panel and create a new session within it
-        lastProvider.show();
-        lastProvider.createNewSession();
-      } else {
-        // Create first chat tab
-        const provider = createWebViewProvider();
-        provider.show();
-      }
+      // Always create a new WebviewPanel (tab) in the same view column
+      // The PanelManager will find existing Qwen Code tabs and open in the same column
+      const provider = createWebViewProvider();
+      provider.show();
     }),
     vscode.commands.registerCommand('qwenCode.clearAuthCache', async () => {
       await authStateManager.clearAuthState();
diff --git a/packages/vscode-ide-companion/src/webview/App.scss b/packages/vscode-ide-companion/src/webview/App.scss
index f2f3b0e3..c40b2821 100644
--- a/packages/vscode-ide-companion/src/webview/App.scss
+++ b/packages/vscode-ide-companion/src/webview/App.scss
@@ -430,8 +430,6 @@ button {
    =========================== */
 .input-form {
   display: flex;
-  /* gap: var(--app-spacing-medium); */
-  /* padding: 16px; */
   background-color: var(--app-primary-background);
   border-top: 1px solid var(--app-primary-border-color);
 }
@@ -626,8 +624,6 @@ button {
   color: var(--app-input-foreground);
   display: flex;
   flex-direction: column;
-  // max-width: 680px;
-  // margin: 0 auto;
   position: relative;
   box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1);
   transition: border-color 0.2s ease, box-shadow 0.2s ease;
@@ -644,7 +640,7 @@ button {
 
 .input-form:focus-within {
   border-color: var(--app-qwen-orange);
-  box-shadow: 0 0 0 1px var(--app-qwen-orange), 0 1px 2px rgba(0, 0, 0, 0.1);
+  box-shadow: 0 1px 2px color-mix(in srgb,var(--app-qwen-orange),transparent 80%);
 }
 
 /* Banner area - for warnings/messages */
diff --git a/packages/vscode-ide-companion/src/webview/App.tsx b/packages/vscode-ide-companion/src/webview/App.tsx
index 5db5e86e..094dc3a7 100644
--- a/packages/vscode-ide-companion/src/webview/App.tsx
+++ b/packages/vscode-ide-companion/src/webview/App.tsx
@@ -612,15 +612,9 @@ export const App: React.FC = () => {
   };
 
   const handleNewQwenSession = () => {
-    vscode.postMessage({ type: 'newQwenSession', data: {} });
+    // Send message to open a new chat tab
+    vscode.postMessage({ type: 'openNewChatTab', data: {} });
     setShowSessionSelector(false);
-    setCurrentSessionId(null);
-    setCurrentSessionTitle('Past Conversations'); // Reset title to default
-    // Clear messages in UI
-    setMessages([]);
-    setCurrentStreamContent('');
-    setPlanEntries([]); // Clear plan entries
-    setToolCalls(new Map()); // Clear tool calls
   };
 
   // Time ago formatter (matching Claude Code)
@@ -1053,6 +1047,14 @@ export const App: React.FC = () => {
                 {getEditModeInfo().icon}
                 <span>{getEditModeInfo().text}</span>
               </button>
+              {activeFileName && (
+                <span
+                  className="active-file-indicator"
+                  title={`Showing Qwen Code your current file selection: ${activeFileName}`}
+                >
+                  {activeFileName}
+                </span>
+              )}
               <div className="action-divider"></div>
               <button
                 type="button"
@@ -1096,14 +1098,6 @@ export const App: React.FC = () => {
                 </svg>
               </button>
               <div className="input-actions-spacer"></div>
-              {activeFileName && (
-                <span
-                  className="active-file-indicator"
-                  title={`Showing Qwen Code your current file selection: ${activeFileName}`}
-                >
-                  {activeFileName}
-                </span>
-              )}
               <button
                 type="submit"
                 className="send-button-icon"
diff --git a/packages/vscode-ide-companion/src/webview/MessageHandler.ts b/packages/vscode-ide-companion/src/webview/MessageHandler.ts
index dec4c639..e64ee91c 100644
--- a/packages/vscode-ide-companion/src/webview/MessageHandler.ts
+++ b/packages/vscode-ide-companion/src/webview/MessageHandler.ts
@@ -170,8 +170,8 @@ export class MessageHandler {
         break;
 
       case 'openNewChatTab':
-        // Create a new session in the current panel instead of opening a new panel
-        await this.handleNewQwenSession();
+        // Create a new WebviewPanel (tab) in the same view column
+        await vscode.commands.executeCommand('qwenCode.openNewChatTab');
         break;
 
       default:
diff --git a/packages/vscode-ide-companion/src/webview/PanelManager.ts b/packages/vscode-ide-companion/src/webview/PanelManager.ts
index 7ec0c570..8da55b41 100644
--- a/packages/vscode-ide-companion/src/webview/PanelManager.ts
+++ b/packages/vscode-ide-companion/src/webview/PanelManager.ts
@@ -42,12 +42,19 @@ export class PanelManager {
       return false; // Panel already exists
     }
 
+    // Find if there's already a Qwen Code webview tab open and get its view column
+    const existingQwenViewColumn = this.findExistingQwenCodeViewColumn();
+
+    // If we found an existing Qwen Code tab, open in the same view column
+    // Otherwise, open beside the active editor
+    const targetViewColumn = existingQwenViewColumn ?? vscode.ViewColumn.Beside;
+
     this.panel = vscode.window.createWebviewPanel(
       'qwenCode.chat',
-      'Qwen Code Chat',
+      'Qwen Code',
       {
-        viewColumn: vscode.ViewColumn.Beside, // Open on right side of active editor
-        preserveFocus: true, // Don't steal focus from editor
+        viewColumn: targetViewColumn,
+        preserveFocus: false, // Focus the new tab
       },
       {
         enableScripts: true,
@@ -69,6 +76,30 @@ export class PanelManager {
     return true; // New panel created
   }
 
+  /**
+   * 查找已存在的 Qwen Code webview 所在的 view column
+   * @returns 找到的 view column，如果没有则返回 undefined
+   */
+  private findExistingQwenCodeViewColumn(): vscode.ViewColumn | undefined {
+    const allTabs = vscode.window.tabGroups.all.flatMap((g) => g.tabs);
+
+    for (const tab of allTabs) {
+      const input: unknown = (tab as { input?: unknown }).input;
+      const isWebviewInput = (inp: unknown): inp is { viewType: string } =>
+        !!inp && typeof inp === 'object' && 'viewType' in inp;
+
+      if (isWebviewInput(input) && input.viewType === 'qwenCode.chat') {
+        // Found an existing Qwen Code tab, get its view column
+        const tabGroup = vscode.window.tabGroups.all.find((g) =>
+          g.tabs.includes(tab),
+        );
+        return tabGroup?.viewColumn;
+      }
+    }
+
+    return undefined;
+  }
+
   /**
    * 自动锁定编辑器组（仅在新创建 Panel 时调用）
    */
diff --git a/packages/vscode-ide-companion/src/webview/WebViewContent.ts b/packages/vscode-ide-companion/src/webview/WebViewContent.ts
index aa099e76..663c536f 100644
--- a/packages/vscode-ide-companion/src/webview/WebViewContent.ts
+++ b/packages/vscode-ide-companion/src/webview/WebViewContent.ts
@@ -39,7 +39,7 @@ export class WebViewContent {
   <meta charset="UTF-8">
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   <meta http-equiv="Content-Security-Policy" content="default-src 'none'; img-src ${panel.webview.cspSource}; script-src ${panel.webview.cspSource}; style-src ${panel.webview.cspSource} 'unsafe-inline';">
-  <title>Qwen Code Chat</title>
+  <title>Qwen Code</title>
 </head>
 <body data-extension-uri="${safeExtensionUri}">
   <div id="root"></div>
diff --git a/packages/vscode-ide-companion/src/webview/components/EmptyState.css b/packages/vscode-ide-companion/src/webview/components/EmptyState.css
index ce580e3f..36642968 100644
--- a/packages/vscode-ide-companion/src/webview/components/EmptyState.css
+++ b/packages/vscode-ide-companion/src/webview/components/EmptyState.css
@@ -30,8 +30,8 @@
 }
 
 .empty-state-logo-image {
-  width: 120px;
-  height: 120px;
+  width: 60px;
+  height: 60px;
   object-fit: contain;
 }
 
diff --git a/packages/vscode-ide-companion/src/webview/components/EmptyState.tsx b/packages/vscode-ide-companion/src/webview/components/EmptyState.tsx
index de8856f7..b02c5fa3 100644
--- a/packages/vscode-ide-companion/src/webview/components/EmptyState.tsx
+++ b/packages/vscode-ide-companion/src/webview/components/EmptyState.tsx
@@ -17,13 +17,11 @@ export const EmptyState: React.FC = () => {
       <div className="empty-state-content">
         {/* Qwen Logo */}
         <div className="empty-state-logo">
-          {iconUri && (
-            <img
-              src={iconUri}
-              alt="Qwen Logo"
-              className="empty-state-logo-image"
-            />
-          )}
+          <img
+            src={iconUri}
+            alt="Qwen Logo"
+            className="empty-state-logo-image"
+          />
           <div className="empty-state-text">
             <div className="empty-state-title">
               What to do first? Ask about this codebase or we can start writing