diff --git a/tabby-terminal/src/components/baseTerminalTab.component.pug b/tabby-terminal/src/components/baseTerminalTab.component.pug
index 975b7344..b40c3c26 100644
--- a/tabby-terminal/src/components/baseTerminalTab.component.pug
+++ b/tabby-terminal/src/components/baseTerminalTab.component.pug
@@ -1,3 +1,4 @@
+.terminal-toolbar-spacer
 .content(#content, [style.opacity]='frontendIsReady ? 1 : 0')
 search-panel(
     *ngIf='showSearchPanel',
diff --git a/tabby-terminal/src/components/baseTerminalTab.component.scss b/tabby-terminal/src/components/baseTerminalTab.component.scss
index 8a4ff441..84fcc561 100644
--- a/tabby-terminal/src/components/baseTerminalTab.component.scss
+++ b/tabby-terminal/src/components/baseTerminalTab.component.scss
@@ -67,9 +67,8 @@
         z-index: 4;
     }
 
-    &.toolbar-pinned {
-        .content {
-            padding-top: $toolbarHeight;
-        }
+    &.toolbar-pinned > .terminal-toolbar-spacer {
+        width: 100%;
+        height: $toolbarHeight;
     }
 }