diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c
index 737a3b56dc..6e0684e5f2 100644
--- a/gtk/gtkwindow.c
+++ b/gtk/gtkwindow.c
@@ -6224,7 +6224,10 @@ update_border_windows (GtkWindow *window)
                                 &border);
   gtk_style_context_restore (context);
 
-  if (!priv->resizable || gtk_window_get_maximized (window))
+  if (!priv->resizable ||
+      priv->tiled ||
+      priv->fullscreen ||
+      gtk_window_get_maximized (window))
     {
       resize_h = resize_v = FALSE;
     }