diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c
index 3dc11728e3..80bab40836 100644
--- a/gtk/gtkwindow.c
+++ b/gtk/gtkwindow.c
@@ -6562,7 +6562,8 @@ get_shadow_width (GtkWidget *widget,
 
   *shadow_width = border;
 
-  if (!priv->client_decorated)
+  if (!priv->decorated ||
+      !priv->client_decorated)
     return;
 
   if (priv->maximized ||