diff --git a/src/intellihide.js b/src/intellihide.js
index 74723e2..a0e3983 100644
--- a/src/intellihide.js
+++ b/src/intellihide.js
@@ -392,7 +392,7 @@ export const Intellihide = class {
     let geom = this._dtpPanel.geom
     let position = geom.position
     let varCoordX1 = this._monitor.x
-    let varCoordY1 = geom.vertical ? geom.y : this._monitor.y // if vertical, ignore the original GS panel if present
+    let varCoordY1 = this._monitor.y + geom.gsTopPanelHeight // if vertical, ignore the original GS panel if present
     let varOffset = {}
 
     if (geom.dockMode && SETTINGS.get_boolean(limitSizeSetting)) {
diff --git a/src/panel.js b/src/panel.js
index 175c972..4b1b946 100644
--- a/src/panel.js
+++ b/src/panel.js
@@ -859,6 +859,7 @@ export const Panel = GObject.registerClass(
         fixedPadding,
         varPadding,
         topOffset, // only if gnome-shell top panel is present and position is TOP
+        gsTopPanelHeight, // only if gnome-shell top panel is present
         position,
         vertical,
         dynamic,
@@ -1155,21 +1156,16 @@ export const Panel = GObject.registerClass(
       this._timeoutsHandler.add([
         T7,
         0,
-        () => {
-          let vertical = this.geom.vertical
-          let w = vertical ? this.geom.outerSize : this.geom.w
-          let h = vertical ? this.geom.h : this.geom.outerSize
-
+        () =>
           Utils.setClip(
             this.clipContainer,
             this.clipContainer.x,
             this.clipContainer.y,
-            w,
-            h,
+            this.panelBox.width,
+            this.panelBox.height,
             0,
             this.geom.topOffset,
-          )
-        },
+          ),
       ])
     }
 
diff --git a/src/stylesheet.css b/src/stylesheet.css
index 05b1e3d..d641847 100644
--- a/src/stylesheet.css
+++ b/src/stylesheet.css
@@ -171,6 +171,7 @@
 
 /* border radius, grrr no css variables in ST */
 #uiGroup.br4 .dashtopanelPanel.dock,
+#uiGroup.br4 .dashtopanelPanel.dock .dashtopanelMainPanel,
 #uiGroup.br4 .show-apps,
 #uiGroup.br4 .dtp-container,
 #uiGroup.br4 .dtp-dots-container,
@@ -186,6 +187,7 @@
 }
 
 #uiGroup.br8 .dashtopanelPanel.dock,
+#uiGroup.br8 .dashtopanelPanel.dock .dashtopanelMainPanel,
 #uiGroup.br8 .show-apps,
 #uiGroup.br8 .dtp-container,
 #uiGroup.br8 .dtp-dots-container,
@@ -201,6 +203,7 @@
 }
 
 #uiGroup.br12 .dashtopanelPanel.dock,
+#uiGroup.br12 .dashtopanelPanel.dock .dashtopanelMainPanel,
 #uiGroup.br12 .show-apps,
 #uiGroup.br12 .dtp-container,
 #uiGroup.br12 .dtp-dots-container,
@@ -216,6 +219,7 @@
 }
 
 #uiGroup.br16 .dashtopanelPanel.dock,
+#uiGroup.br16 .dashtopanelPanel.dock .dashtopanelMainPanel,
 #uiGroup.br16 .show-apps,
 #uiGroup.br16 .dtp-container,
 #uiGroup.br16 .dtp-dots-container,
@@ -231,6 +235,7 @@
 }
 
 #uiGroup.br20 .dashtopanelPanel.dock,
+#uiGroup.br20 .dashtopanelPanel.dock .dashtopanelMainPanel,
 #uiGroup.br20 .show-apps,
 #uiGroup.br20 .dtp-container,
 #uiGroup.br20 .dtp-dots-container,