diff --git a/src/core/window.c b/src/core/window.c
index 66e37e126..9252ab22d 100644
--- a/src/core/window.c
+++ b/src/core/window.c
@@ -8251,9 +8251,6 @@ recalc_window_features (MetaWindow *window)
   if (window->type == META_WINDOW_TOOLBAR)
     window->decorated = FALSE;
 
-  if (meta_window_is_attached_dialog (window))
-    window->border_only = TRUE;
-
   if (window->type == META_WINDOW_DESKTOP ||
       window->type == META_WINDOW_DOCK ||
       window->override_redirect)
@@ -10986,7 +10983,7 @@ meta_window_get_frame_type (MetaWindow *window)
       /* can't add border if undecorated */
       return META_FRAME_TYPE_LAST;
     }
-  else if ((window->border_only && base_type != META_FRAME_TYPE_ATTACHED) ||
+  else if (window->border_only ||
            (window->hide_titlebar_when_maximized && META_WINDOW_MAXIMIZED (window)) ||
            (window->hide_titlebar_when_maximized && META_WINDOW_TILED_SIDE_BY_SIDE (window)))
     {