diff --git a/SidebarDiagnostics/Windows.cs b/SidebarDiagnostics/Windows.cs
index 43d8896..bd4e953 100644
--- a/SidebarDiagnostics/Windows.cs
+++ b/SidebarDiagnostics/Windows.cs
@@ -873,7 +873,10 @@ public static void GetWorkArea(AppBarWindow window, out int screen, out DockEdge
             };
 
             windowWA = Windows.WorkArea.FromRECT(_active.WorkArea);
-            windowWA.Scale(_active.InverseScaleX, _active.InverseScaleY);
+            
+            double scaleX = _active.ScaleX / _primary.ScaleX;
+            double scaleY = _active.ScaleY / _primary.ScaleY;
+            windowWA.Scale(scaleX, scaleY);
 
             double _modifyX = 0d;
             double _modifyY = 0d;
@@ -889,6 +892,9 @@ public static void GetWorkArea(AppBarWindow window, out int screen, out DockEdge
 
             windowWA.Offset(_offsetX, _offsetY);
 
+            windowWA.Top = 0;
+            windowWA.Bottom = _active.WorkArea.Height;
+            
             appbarWA = Windows.WorkArea.FromRECT(_active.WorkArea);
 
             appbarWA.Offset(_modifyX, _modifyY);
@@ -1530,4 +1536,4 @@ private IntPtr AppBarHook(IntPtr hwnd, int msg, IntPtr wParam, IntPtr lParam, re
 
         private CancellationTokenSource _cancelReposition { get; set; }
     }
-}
\ No newline at end of file
+}