diff --git a/src/core/place.c b/src/core/place.c
index 613f27061..6c0efc128 100644
--- a/src/core/place.c
+++ b/src/core/place.c
@@ -344,7 +344,7 @@ avoid_being_obscured_as_second_modal_dialog (MetaWindow *window,
   /* denied_focus_and_not_transient is only set when focus_window != NULL */
 
   if (window->denied_focus_and_not_transient &&
-      window->wm_state_modal && /* FIXME: Maybe do this for all transients? */
+      window->type == META_WINDOW_MODAL_DIALOG &&
       meta_window_same_application (window, focus_window) &&
       window_overlaps_focus_window (window))
     {
diff --git a/src/core/window.c b/src/core/window.c
index aade427a8..4a20adb97 100644
--- a/src/core/window.c
+++ b/src/core/window.c
@@ -5687,7 +5687,7 @@ get_modal_transient (MetaWindow *window)
       MetaWindow *transient = tmp->data;
 
       if (transient->transient_for == modal_transient &&
-          transient->wm_state_modal)
+          transient->type == META_WINDOW_MODAL_DIALOG)
         {
           modal_transient = transient;
           tmp = windows;