diff --git a/discover_overlay/discover_overlay.py b/discover_overlay/discover_overlay.py
index d47e878..7fcc367 100755
--- a/discover_overlay/discover_overlay.py
+++ b/discover_overlay/discover_overlay.py
@@ -276,12 +276,16 @@ class Discover:
         self.voice_overlay.set_force_xshape(force)
         if self.text_overlay:
             self.text_overlay.set_force_xshape(force)
+        if self.notification_overlay:
+            self.notification_overlay.set_force_xshape(force)
 
     def set_show_task(self, visible):
         if self.voice_overlay:
             self.voice_overlay.set_task(visible)
         if self.text_overlay:
             self.text_overlay.set_task(visible)
+        if self.notification_overlay:
+            self.notification_overlay.set_task(visible)
 
     def set_sys_tray_icon_visible(self, visible):
         """
@@ -326,7 +330,6 @@ def entrypoint():
     log = logging.getLogger(__name__)
     log.info("Starting Discover Overlay: %s",
              pkg_resources.get_distribution('discover_overlay').version)
-
     # Flatpak compat mode
     try:
         if "container" in os.environ and os.environ["container"] == "flatpak":
diff --git a/discover_overlay/overlay.py b/discover_overlay/overlay.py
index 4071ba9..a51582c 100644
--- a/discover_overlay/overlay.py
+++ b/discover_overlay/overlay.py
@@ -306,7 +306,7 @@ class OverlayWindow(Gtk.Window):
         """
         self.force_xshape = force
 
-        if self.is_wayland:
+        if self.is_wayland or self.discover.steamos:
             # Wayland and XShape are a bad idea unless you're a fan on artifacts
             self.force_xshape = False