diff --git a/gtk/gtkcolorswatch.c b/gtk/gtkcolorswatch.c
index a88ce46624..b3459a7c16 100644
--- a/gtk/gtkcolorswatch.c
+++ b/gtk/gtkcolorswatch.c
@@ -183,8 +183,6 @@ swatch_draw (GtkWidget *widget,
       g_object_unref (gicon);
     }
 
-  gtk_style_context_restore (context);
-
   /* now draw the overlay image */
   gtk_style_context_get_border (context, state, &border);
   gtk_style_context_get_padding (context, state, &padding);
@@ -222,6 +220,8 @@ swatch_draw (GtkWidget *widget,
       gtk_render_focus (context, cr, 0, 0, width, height);
     }
 
+  gtk_style_context_restore (context);
+
   return FALSE;
 }