diff --git a/src/sass/gtk/_common-4.0.scss b/src/sass/gtk/_common-4.0.scss
index 265ede79..1b9f10cb 100644
--- a/src/sass/gtk/_common-4.0.scss
+++ b/src/sass/gtk/_common-4.0.scss
@@ -1962,6 +1962,16 @@ headerbar {
     border: none;
     background: none;
 
+    > windowhandle > box {
+      padding: 0 8px;
+  
+      &,
+      > box.start,
+      > box.end {
+        border-spacing: $container_padding;
+      }
+    }
+
     windowcontrols {
       padding: 0 $container_padding / 2;
     }