diff --git a/data/theme/cinnamon-sass/widgets/_osd.scss b/data/theme/cinnamon-sass/widgets/_osd.scss
index 099c61020e..54acc7a652 100644
--- a/data/theme/cinnamon-sass/widgets/_osd.scss
+++ b/data/theme/cinnamon-sass/widgets/_osd.scss
@@ -12,7 +12,7 @@ $ws_dot_inactive: $ws_indicator_height / 6;
   @extend %osd_base;
   @extend %title_4;
 
-  margin-bottom: 4em;
+  margin-bottom: 1em;
   border-radius: 9999px;
   font-weight: bold;
   spacing: $base_padding * 2;
@@ -59,7 +59,7 @@ $ws_dot_inactive: $ws_indicator_height / 6;
   @extend %title_4;
 
   min-width: 140px;
-  margin-bottom: 4em;
+  margin-bottom: 1em;
   border-radius: 9999px;
   font-weight: bold;
   padding: $base_padding * 2 $base_padding * 6 0 $base_padding * 6;
diff --git a/js/ui/osdWindow.js b/js/ui/osdWindow.js
index 82491c525e..3329ee8b23 100644
--- a/js/ui/osdWindow.js
+++ b/js/ui/osdWindow.js
@@ -42,7 +42,10 @@ class OsdWindow extends Clutter.Actor {
         });
 
         this._monitorIndex = monitorIndex;
-        let constraint = new Layout.MonitorConstraint({ index: monitorIndex });
+        let constraint = new Layout.MonitorConstraint({
+            index: monitorIndex,
+            work_area: true,
+        });
         this.add_constraint(constraint);
 
         this._hbox = new St.BoxLayout({
diff --git a/js/ui/workspaceOsd.js b/js/ui/workspaceOsd.js
index f923733179..2e55610564 100644
--- a/js/ui/workspaceOsd.js
+++ b/js/ui/workspaceOsd.js
@@ -27,7 +27,10 @@ class WorkspaceOsd extends Clutter.Actor {
 
         this.set_offscreen_redirect(Clutter.OffscreenRedirect.ALWAYS);
 
-        let constraint = new Layout.MonitorConstraint({ index: monitorIndex });
+        let constraint = new Layout.MonitorConstraint({
+            index: monitorIndex,
+            work_area: true,
+        });
         this.add_constraint(constraint);
 
         Main.uiGroup.add_actor(this);