--- workspace.c~	2005-07-13 10:06:21.000000000 -0700
+++ workspace.c	2006-01-06 21:11:36.000000000 -0800
@@ -758,13 +758,13 @@
     }
 
   if (layout.current_col < 0)
-    layout.current_col = 0;
-  if (layout.current_col >= layout.cols)
     layout.current_col = layout.cols - 1;
+  if (layout.current_col >= layout.cols)
+    layout.current_col = 0;
   if (layout.current_row < 0)
-    layout.current_row = 0;
-  if (layout.current_row >= layout.rows)
     layout.current_row = layout.rows - 1;
+  if (layout.current_row >= layout.rows)
+    layout.current_row = 0;
 
   i = layout.grid[layout.current_row * layout.cols + layout.current_col];