--- rxvt-unicode/src/scrollbar.C	2011/08/28 18:48:41	1.71
+++ rxvt-unicode/src/scrollbar.C	2011/08/28 19:04:23	1.72
@@ -40,16 +40,15 @@
 
       if (!win)
         resize ();
-
-      if (win)
-        {
-          XMapWindow (term->dpy, win);
-        }
+      else
+        XMapWindow (term->dpy, win);
     }
   else
     {
       state = STATE_OFF;
-      XUnmapWindow (term->dpy, win);
+
+      if (win)
+        XUnmapWindow (term->dpy, win);
     }
 }