diff --git a/gtk/gtkentry.c b/gtk/gtkentry.c
index bb85eadfc6..beb91c615e 100644
--- a/gtk/gtkentry.c
+++ b/gtk/gtkentry.c
@@ -5753,6 +5753,8 @@ gtk_entry_draw_text (GtkEntry *entry,
                      &progress_x, &progress_y,
                      &progress_width, &progress_height);
 
+  cairo_save (cr);
+
   clip_width = gdk_window_get_width (priv->text_area);
   clip_height = gdk_window_get_height (priv->text_area);
   cairo_rectangle (cr, 0, 0, clip_width, clip_height);
@@ -5799,6 +5801,8 @@ gtk_entry_draw_text (GtkEntry *entry,
 
       cairo_restore (cr);
     }
+
+  cairo_restore (cr);
 }
 
 static void