diff --git a/src/apprt/gtk/Window.zig b/src/apprt/gtk/Window.zig
index 63ee57d95..bf80c4a1a 100644
--- a/src/apprt/gtk/Window.zig
+++ b/src/apprt/gtk/Window.zig
@@ -210,14 +210,11 @@ pub fn init(self: *Window, app: *App) !void {
         self.header = header;
     }
 
+    _ = c.g_signal_connect_data(gtk_window, "notify::decorated", c.G_CALLBACK(&gtkWindowNotifyDecorated), self, null, c.G_CONNECT_DEFAULT);
+
     // If we are disabling decorations then disable them right away.
     if (!app.config.@"window-decoration") {
         c.gtk_window_set_decorated(gtk_window, 0);
-
-        // Fix any artifacting that may occur in window corners.
-        if (app.config.@"gtk-titlebar") {
-            c.gtk_widget_add_css_class(window, "without-window-decoration-and-with-titlebar");
-        }
     }
 
     // If Adwaita is enabled and is older than 1.4.0 we don't have the tab overview and so we
@@ -539,13 +536,6 @@ pub fn toggleWindowDecorations(self: *Window) void {
     const new_decorated = !old_decorated;
     c.gtk_window_set_decorated(self.window, @intFromBool(new_decorated));
 
-    // Fix any artifacting that may occur in window corners.
-    if (new_decorated) {
-        c.gtk_widget_add_css_class(@ptrCast(self.window), "without-window-decoration-and-with-titlebar");
-    } else {
-        c.gtk_widget_remove_css_class(@ptrCast(self.window), "without-window-decoration-and-with-titlebar");
-    }
-
     // If we have a titlebar, then we also show/hide it depending on the
     // decorated state. GTK tends to consider the titlebar part of the frame
     // and hides it with decorations, but libadwaita doesn't. This makes it
@@ -589,6 +579,24 @@ fn gtkRealize(v: *c.GtkWindow, ud: ?*anyopaque) callconv(.C) bool {
     return true;
 }
 
+fn gtkWindowNotifyDecorated(
+    object: *c.GObject,
+    _: *c.GParamSpec,
+    _: ?*anyopaque,
+) callconv(.C) void {
+    if (c.gtk_window_get_decorated(@ptrCast(object)) == 1) {
+        c.gtk_widget_remove_css_class(@ptrCast(object), "ssd");
+        c.gtk_widget_remove_css_class(@ptrCast(object), "no-border-radius");
+    } else {
+        // Fix any artifacting that may occur in window corners. The .ssd CSS
+        // class is defined in the GtkWindow documentation:
+        // https://docs.gtk.org/gtk4/class.Window.html#css-nodes. A definition
+        // for .ssd is provided by GTK and Adwaita.
+        c.gtk_widget_add_css_class(@ptrCast(object), "ssd");
+        c.gtk_widget_add_css_class(@ptrCast(object), "no-border-radius");
+    }
+}
+
 // Note: we MUST NOT use the GtkButton parameter because gtkActionNewTab
 // sends an undefined value.
 fn gtkTabNewClick(_: *c.GtkButton, ud: ?*anyopaque) callconv(.C) void {
diff --git a/src/apprt/gtk/style.css b/src/apprt/gtk/style.css
index bf0ee62f6..d1e848ac6 100644
--- a/src/apprt/gtk/style.css
+++ b/src/apprt/gtk/style.css
@@ -33,7 +33,11 @@ label.size-overlay.hidden {
   opacity: 0;
 }
 
-window.without-window-decoration-and-with-titlebar {
+window.ssd.no-border-radius {
+  /* Without clearing the border radius, at least on Mutter with
+   * gtk-titlebar=true and gtk-adwaita=false, there is some window artifacting
+   * that this will mitigate.
+   */
   border-radius: 0 0;
 }