diff --git a/gtk-3.20/scss/widgets/_toolbar.scss b/gtk-3.20/scss/widgets/_toolbar.scss
index 0e0d688..c8a89f9 100755
--- a/gtk-3.20/scss/widgets/_toolbar.scss
+++ b/gtk-3.20/scss/widgets/_toolbar.scss
@@ -67,6 +67,18 @@
 
         border-width: 0 0 1px;
         border-style: solid;
+
+        window:not(.tiled):not(.maximized) separator:first-child + &, // tackles the paned container case
+        window:not(.tiled):not(.maximized) &:first-child { &:backdrop, & { border-top-left-radius: $roundness; } }
+
+        window:not(.tiled):not(.maximized) &:last-child { &:backdrop, & { border-top-right-radius: $roundness; } }
+    }
+
+    .background:not(.tiled):not(.maximized) .titlebar {
+        &:backdrop, & {
+            border-top-left-radius: $roundness;
+            border-top-right-radius: $roundness;
+        }
     }
 
     .titlebar {