diff --git a/web-ui/code.js b/web-ui/code.js
index b609b86..1a0d6a5 100644
--- a/web-ui/code.js
+++ b/web-ui/code.js
@@ -759,7 +759,10 @@ function addLocalShell() {
   setTimeout(() => {
     const shell = codeTermShells.find(s => s.id === id);
     if (companionConnected && companionWs && shell?.term) {
-      companionWs.send(JSON.stringify({ type: 'shell', rows: shell.term.rows, cols: shell.term.cols }));
+      if (shell.fitAddon) shell.fitAddon.fit();
+      const rows = shell.term.rows > 0 ? shell.term.rows : 24;
+      const cols = shell.term.cols > 0 ? shell.term.cols : 80;
+      companionWs.send(JSON.stringify({ type: 'shell', rows, cols }));
     }
   }, 300);
 }