diff --git a/src/cairo-ps-surface.c b/src/cairo-ps-surface.c
index 6bf16df40..282188acd 100644
--- a/src/cairo-ps-surface.c
+++ b/src/cairo-ps-surface.c
@@ -211,12 +211,12 @@ _cairo_ps_surface_emit_header (cairo_ps_surface_t *surface)
 				 "/cairo_selectfont { cairo_font_matrix aload pop pop pop 0 0 6 array astore\n"
 				 "    cairo_font exch selectfont cairo_point_x cairo_point_y moveto } bind def\n"
 				 "/Tf { pop /cairo_font exch def /cairo_font_matrix where\n"
-				 "      { cairo_selectfont } if } bind def\n"
+				 "      { pop cairo_selectfont } if } bind def\n"
 				 "/Td { matrix translate cairo_font_matrix matrix concatmatrix dup\n"
 				 "      /cairo_font_matrix exch def dup 4 get exch 5 get cairo_store_point\n"
-				 "      /cairo_font where { cairo_selectfont } if } bind def\n"
+				 "      /cairo_font where { pop cairo_selectfont } if } bind def\n"
 				 "/Tm { 2 copy 8 2 roll 6 array astore /cairo_font_matrix exch def\n"
-				 "      cairo_store_point /cairo_font where { cairo_selectfont } if } bind def\n"
+				 "      cairo_store_point /cairo_font where { pop cairo_selectfont } if } bind def\n"
 				 "/g { setgray } bind def\n"
 				 "/rg { setrgbcolor } bind def\n"
 				 "/d1 { setcachedevice } bind def\n");