--- src/switchpanel.c.orig      2004-10-30 08:16:04.000000000 +0100
+++ src/switchpanel.c   2006-08-09 09:33:20.000000000 +0100
@@ -464,7 +464,7 @@
     iconsThatFitCount= count;
 
     if (width > rect.size.width) {
-        iconsThatFitCount = (WMScreenWidth(scr->wmscreen)-SCREEN_BORDER_SPACING)/ICON_TILE_SIZE;
+        iconsThatFitCount = (rect.size.width-SCREEN_BORDER_SPACING)/ICON_TILE_SIZE;
         width= iconsThatFitCount*ICON_TILE_SIZE;
     }