diff --git a/ServerDeck/src/App.tsx b/ServerDeck/src/App.tsx
index 3a2b758..8b0d002 100644
--- a/ServerDeck/src/App.tsx
+++ b/ServerDeck/src/App.tsx
@@ -4743,21 +4743,25 @@ export default function App() {
                   <span className="preview-switch__label">{messages.preview}</span>
                 </label>
               </div>
-              <div
-                className="terminal-frame"
-                ref={handleTerminalMount}
-                onMouseDown={() => terminalRef.current?.focus()}
-                style={{ background: activeTerminalTheme.theme.background }}
-              />
+              <div className="terminal-frame-shell" style={{ background: activeTerminalTheme.theme.background }}>
+                <div
+                  className="terminal-frame"
+                  ref={handleTerminalMount}
+                  onMouseDown={() => terminalRef.current?.focus()}
+                  style={{ background: activeTerminalTheme.theme.background }}
+                />
+              </div>
             </section>
           ) : (
             <section className="terminal-screen" style={{ background: activeTerminalTheme.theme.background }}>
-              <div
-                className="terminal-frame"
-                ref={handleTerminalMount}
-                onMouseDown={() => terminalRef.current?.focus()}
-                style={{ background: activeTerminalTheme.theme.background }}
-              />
+              <div className="terminal-frame-shell" style={{ background: activeTerminalTheme.theme.background }}>
+                <div
+                  className="terminal-frame"
+                  ref={handleTerminalMount}
+                  onMouseDown={() => terminalRef.current?.focus()}
+                  style={{ background: activeTerminalTheme.theme.background }}
+                />
+              </div>
             </section>
           )}
         </main>
diff --git a/ServerDeck/src/components/terminal/LocalTerminalWorkspace.tsx b/ServerDeck/src/components/terminal/LocalTerminalWorkspace.tsx
index fb69313..38e0dab 100644
--- a/ServerDeck/src/components/terminal/LocalTerminalWorkspace.tsx
+++ b/ServerDeck/src/components/terminal/LocalTerminalWorkspace.tsx
@@ -271,12 +271,14 @@ export function LocalTerminalWorkspace({
         </div>
       ) : (
         <div className="local-terminal-workspace__terminal-pane">
-          <div
-            className="terminal-frame terminal-frame--workspace"
-            ref={onTerminalMount}
-            onMouseDown={onFocusTerminal}
-            style={{ background: terminalBackground }}
-          />
+          <div className="terminal-frame-shell terminal-frame-shell--workspace" style={{ background: terminalBackground }}>
+            <div
+              className="terminal-frame terminal-frame--workspace"
+              ref={onTerminalMount}
+              onMouseDown={onFocusTerminal}
+              style={{ background: terminalBackground }}
+            />
+          </div>
         </div>
       )}
     </section>
diff --git a/ServerDeck/src/styles/app.css b/ServerDeck/src/styles/app.css
index 5f42ebd..114130f 100644
--- a/ServerDeck/src/styles/app.css
+++ b/ServerDeck/src/styles/app.css
@@ -1095,6 +1095,12 @@ select {
   border-left: 0;
 }
 
+.terminal-frame-shell--workspace {
+  height: 100%;
+  min-height: 0;
+  border-left: 0;
+}
+
 .terminal-frame--workspace {
   height: 100%;
   min-height: 0;
@@ -4382,13 +4388,23 @@ select {
   background: transparent;
 }
 
-.terminal-frame {
+.terminal-frame-shell {
   flex: 1;
   min-height: 480px;
   margin-top: 0;
   overflow: hidden;
   background: #0b1220;
   padding: 12px;
+  box-sizing: border-box;
+}
+
+.terminal-frame {
+  width: 100%;
+  height: 100%;
+  min-height: 0;
+  margin-top: 0;
+  overflow: hidden;
+  background: #0b1220;
 }
 
 @keyframes pulse {