diff --git a/gtk/gtkbuiltinicon.c b/gtk/gtkbuiltinicon.c
index 71a44f6c26..8a57a617fa 100644
--- a/gtk/gtkbuiltinicon.c
+++ b/gtk/gtkbuiltinicon.c
@@ -105,11 +105,13 @@ gtk_builtin_icon_draw (GtkCssGadget *gadget,
 {
   GtkBuiltinIconPrivate *priv = gtk_builtin_icon_get_instance_private (GTK_BUILTIN_ICON (gadget));
 
+  cairo_save (cr);
   gtk_css_style_render_icon (gtk_css_gadget_get_style (gadget),
                              cr,
                              x, y,
                              width, height,
                              priv->image_type);
+  cairo_restore (cr);
 
   return FALSE;
 }
diff --git a/gtk/gtkexpander.c b/gtk/gtkexpander.c
index f3f6a00875..fdeb634107 100644
--- a/gtk/gtkexpander.c
+++ b/gtk/gtkexpander.c
@@ -887,9 +887,7 @@ gtk_expander_render_title (GtkCssGadget *gadget,
   GtkExpander *expander = GTK_EXPANDER (widget);
   GtkExpanderPrivate *priv = expander->priv;
 
-  cairo_save (cr);
   gtk_css_gadget_draw (priv->arrow_gadget, cr);
-  cairo_restore (cr);
 
   return gtk_widget_has_visible_focus (widget);
 }