--- rxvt-unicode/src/rxvtfont.C	2008/01/23 05:59:29	1.130
+++ rxvt-unicode/src/rxvtfont.C	2008/01/23 06:05:54	1.132
@@ -1353,6 +1353,8 @@
               Picture dst = 0;
 
               if (bg >= 0 && term->pix_colors[bg].is_opaque ())
+                XftDrawRect (d2, &term->pix_colors[bg].c, 0, 0, w, h);
+              else
                 dst = XftDrawPicture (d2);
 
               if (dst)
@@ -1401,8 +1403,8 @@
             }
 #endif
 
-          if (bg >= 0 && !back_rendered)
-            XftDrawRect (d2, &term->pix_colors[bg].c, 0, 0, w, h);
+          if (!back_rendered)
+            XftDrawRect (d2, &term->pix_colors[bg < 0 ? Color_bg : bg].c, 0, 0, w, h);
 
           XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc);
           XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y);