diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c
index c9ca7faef6..9f6676c805 100644
--- a/gtk/gtkwindow.c
+++ b/gtk/gtkwindow.c
@@ -5806,7 +5806,8 @@ update_csd_visibility (GtkWindow *window)
   if (priv->title_box == NULL)
     return FALSE;
 
-  visible = !priv->fullscreen;
+  visible = !priv->fullscreen &&
+            priv->decorated;
 
   gtk_widget_set_child_visible (priv->title_box, visible);