diff --git a/src/ui/frames.c b/src/ui/frames.c
index 6abe52ef6..cb21ab837 100644
--- a/src/ui/frames.c
+++ b/src/ui/frames.c
@@ -1358,10 +1358,19 @@ meta_ui_frame_get_mask (MetaUIFrame *frame,
                          borders.invisible.left / scale,
                          borders.invisible.top / scale,
                          frame_rect.width / scale, frame_rect.height / scale);
+  gtk_render_frame (frame->style_info->styles[META_STYLE_ELEMENT_FRAME], cr,
+                    borders.invisible.left / scale,
+                    borders.invisible.top / scale,
+                    frame_rect.width / scale, frame_rect.height / scale);
+
   gtk_render_background (frame->style_info->styles[META_STYLE_ELEMENT_TITLEBAR], cr,
                          borders.invisible.left / scale,
                          borders.invisible.top / scale,
                          frame_rect.width / scale, borders.total.top / scale);
+  gtk_render_frame (frame->style_info->styles[META_STYLE_ELEMENT_TITLEBAR], cr,
+                    borders.invisible.left / scale,
+                    borders.invisible.top / scale,
+                    frame_rect.width / scale, borders.total.top / scale);
 }
 
 /* XXX -- this is disgusting. Find a better approach here.