diff --git a/po/xfwm4.pot b/po/xfwm4.pot
index 6f4c2309032dec67aad304ba838016c5e75613bc..60862c1393c6d7755d827745b8a512f8c01ff305 100644
--- a/po/xfwm4.pot
+++ b/po/xfwm4.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-09-23 00:40+0200\n"
+"POT-Creation-Date: 2004-09-23 08:01+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -544,7 +544,7 @@ msgstr ""
 msgid "Compose shortcut for command :"
 msgstr ""
 
-#: src/events.c:1653
+#: src/events.c:1690
 #, c-format
 msgid "%s: Operation not supported (yet)\n"
 msgstr ""
diff --git a/src/events.c b/src/events.c
index 2562095a3cea67b5e67445e0f8161e23c59578a5..d4244747836c00059f1662e66d1869e2636b7233 100644
--- a/src/events.c
+++ b/src/events.c
@@ -1335,10 +1335,11 @@ handleLeaveNotify (DisplayInfo *display_info, XCrossingEvent * ev)
     }
     
     if ((ev->window == MYWINDOW_XWINDOW (screen_info->sidewalk[0])) || 
-        (ev->window == MYWINDOW_XWINDOW (screen_info->sidewalk[1])))
+        (ev->window == MYWINDOW_XWINDOW (screen_info->sidewalk[1])) ||
+        (ev->window == MYWINDOW_XWINDOW (screen_info->sidewalk[3])) ||
+        (ev->window == MYWINDOW_XWINDOW (screen_info->sidewalk[4])))
     {
-        TRACE ("Reset edge_scroll_x");
-        TRACE ("Reset edge_scroll_y");
+        TRACE ("Reset edge_scroll_x and edge_scroll_y");
         edge_scroll_x = 0;
         edge_scroll_y = 0;
     }
diff --git a/src/misc.c b/src/misc.c
index f255c5b8e4a2e2a7c0f37f96d10ba22e9f3e6648..7119f66baef515c388faaf3fdf22e99912a19951 100644
--- a/src/misc.c
+++ b/src/misc.c
@@ -147,24 +147,38 @@ placeSidewalks(ScreenInfo *screen_info, gboolean activate)
 {
     g_return_if_fail (MYWINDOW_XWINDOW (screen_info->sidewalk[0]) != None);
     g_return_if_fail (MYWINDOW_XWINDOW (screen_info->sidewalk[1]) != None);
+    g_return_if_fail (MYWINDOW_XWINDOW (screen_info->sidewalk[2]) != None);
+    g_return_if_fail (MYWINDOW_XWINDOW (screen_info->sidewalk[3]) != None);
 
     if (activate)
     {
         xfwmWindowShow (&screen_info->sidewalk[0], 
-                      0, 0,
-                      1, gdk_screen_get_height (screen_info->gscr), FALSE);
+                        0, 0,
+                        1, gdk_screen_get_height (screen_info->gscr), FALSE);
         xfwmWindowShow (&screen_info->sidewalk[1],
-                      gdk_screen_get_width (screen_info->gscr) - 1, 0, 
-                      1, gdk_screen_get_height (screen_info->gscr), FALSE);
+                        gdk_screen_get_width (screen_info->gscr) - 1, 0, 
+                        1, gdk_screen_get_height (screen_info->gscr), FALSE);
+        xfwmWindowShow (&screen_info->sidewalk[2], 
+                        0, 0, 
+                        gdk_screen_get_width (screen_info->gscr), 1, FALSE);
+        xfwmWindowShow (&screen_info->sidewalk[3],
+                        0, gdk_screen_get_height (screen_info->gscr) - 1, 
+                        gdk_screen_get_width (screen_info->gscr), 1, FALSE);
     }
     else
     {
         /* Place the windows off screen */
         xfwmWindowShow (&screen_info->sidewalk[0], 
-                      -1, 0,
-                       1, gdk_screen_get_height (screen_info->gscr), FALSE);
+                        -1, 0,
+                        1, gdk_screen_get_height (screen_info->gscr), FALSE);
         xfwmWindowShow (&screen_info->sidewalk[1],
-                      gdk_screen_get_width (screen_info->gscr), 0, 
-                      1, gdk_screen_get_height (screen_info->gscr), FALSE);
+                        gdk_screen_get_width (screen_info->gscr), 0, 
+                        1, gdk_screen_get_height (screen_info->gscr), FALSE);
+        xfwmWindowShow (&screen_info->sidewalk[2], 
+                        0, -1, 
+                        gdk_screen_get_width (screen_info->gscr), 1, FALSE);
+        xfwmWindowShow (&screen_info->sidewalk[3],
+                        0, gdk_screen_get_height (screen_info->gscr), 
+                        gdk_screen_get_width (screen_info->gscr), 1, FALSE);
     }
 }
diff --git a/src/screen.c b/src/screen.c
index 098557d5f7c1064331ed0a027b19bbfe7748edec..e3ee9ad59d817dac7dd053c41501ccec54150e25 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -113,7 +113,8 @@ myScreenInit (DisplayInfo *display_info, GdkScreen *gscr, unsigned long event_ma
     screen_info->button_handler_id = 0L;
     
     /* Create the side windows to detect edge movement */
-    xfwmWindowTemp (display_info->dpy, screen_info->xroot, &screen_info->sidewalk[0], 0, 0, 
+    xfwmWindowTemp (display_info->dpy, screen_info->xroot, &screen_info->sidewalk[0], 
+                                  0, 0, 
                                   1, gdk_screen_get_height (gscr), 
                                   LeaveWindowMask | PointerMotionMask);
 
@@ -122,7 +123,8 @@ myScreenInit (DisplayInfo *display_info, GdkScreen *gscr, unsigned long event_ma
                                   1, gdk_screen_get_height (gscr), 
                                   LeaveWindowMask | PointerMotionMask);
 
-    xfwmWindowTemp (display_info->dpy, screen_info->xroot, &screen_info->sidewalk[2], 0, 0, 
+    xfwmWindowTemp (display_info->dpy, screen_info->xroot, &screen_info->sidewalk[2], 
+                                  0, 0, 
                                   gdk_screen_get_width (gscr), 1,
                                   LeaveWindowMask | PointerMotionMask);
 
diff --git a/src/stacking.c b/src/stacking.c
index 96ce99bdd633df7a42773ec42f3f42dfb3655063..bb7babe444f47b92b6a08691875b52819e75f717 100644
--- a/src/stacking.c
+++ b/src/stacking.c
@@ -44,9 +44,11 @@ clientApplyStackList (ScreenInfo *screen_info)
     DBG ("applying stack list");
     nwindows = g_list_length (screen_info->windows_stack);
 
-    xwinstack = g_new (Window, nwindows + 2);
+    xwinstack = g_new (Window, nwindows + 4);
     xwinstack[i++] = MYWINDOW_XWINDOW (screen_info->sidewalk[0]);
     xwinstack[i++] = MYWINDOW_XWINDOW (screen_info->sidewalk[1]);
+    xwinstack[i++] = MYWINDOW_XWINDOW (screen_info->sidewalk[3]);
+    xwinstack[i++] = MYWINDOW_XWINDOW (screen_info->sidewalk[4]);
 
     if (nwindows)
     {