diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c
index 1c146e79c5..53f74e8593 100644
--- a/gtk/gtkwindow.c
+++ b/gtk/gtkwindow.c
@@ -5806,7 +5806,8 @@ create_decoration (GtkWidget *widget)
   GtkWindow *window = GTK_WINDOW (widget);
   GtkWindowPrivate *priv = window->priv;
 
-  if (!gtk_window_supports_client_shadow (window))
+  priv->use_client_shadow = gtk_window_supports_client_shadow (window);
+  if (!priv->use_client_shadow)
     return;
 
   gtk_window_enable_csd (window);