diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c
index 76b59de973..8c07e21f58 100644
--- a/gtk/gtkwindow.c
+++ b/gtk/gtkwindow.c
@@ -79,6 +79,10 @@
 #include "broadway/gdkbroadway.h"
 #endif
 
+#ifdef GDK_WINDOWING_MIR
+#include "mir/gdkmir.h"
+#endif
+
 /**
  * SECTION:gtkwindow
  * @title: GtkWindow
@@ -5708,6 +5712,11 @@ gtk_window_should_use_csd (GtkWindow *window)
     return TRUE;
 #endif
 
+#ifdef GDK_WINDOWING_MIR
+  if (GDK_IS_MIR_DISPLAY (gtk_widget_get_display (GTK_WIDGET (window))))
+    return TRUE;
+#endif
+
   csd_env = g_getenv ("GTK_CSD");
 
   return (g_strcmp0 (csd_env, "1") == 0);