diff --git a/src/core/frame.c b/src/core/frame.c
index c601e14b6..6c38ae521 100644
--- a/src/core/frame.c
+++ b/src/core/frame.c
@@ -154,8 +154,9 @@ meta_window_ensure_frame (MetaWindow *window)
   window->frame = frame;
 
   /* Now that frame->xwindow is registered with window, we can set its
-   * background.
+   * style and background.
    */
+  meta_ui_update_frame_style (window->screen->ui, frame->xwindow);
   meta_ui_reset_frame_bg (window->screen->ui, frame->xwindow);
   
   if (window->title)
diff --git a/src/ui/frames.c b/src/ui/frames.c
index 64790e8d1..9f0126cfd 100644
--- a/src/ui/frames.c
+++ b/src/ui/frames.c
@@ -686,7 +686,6 @@ meta_frames_manage_window (MetaFrames *frames,
   gdk_window_set_user_data (frame->window, frames);
 
   frame->style = NULL;
-  meta_frames_attach_style (frames, frame);
 
   /* Don't set event mask here, it's in frame.c */