diff --git a/src/border.c b/src/border.c
index 6a367f37e..976587f56 100644
--- a/src/border.c
+++ b/src/border.c
@@ -1334,7 +1334,7 @@ e_border_new(void)
    b->client.titlebar = 1;
    b->client.takes_focus = 1;
    
-   desk = e_desktops_get(e_desktops_get_current());
+   desk = e_desktops_get(0);
    e_desktops_add_border(desk, b);
    b->win.main = e_window_override_new(desk->win.container, 0, 0, 1, 1);
    b->win.input = e_window_input_new(b->win.main, 0, 0, 1, 1);
@@ -2357,7 +2357,7 @@ e_border_focus_grab_ended(void)
 int
 e_border_viewable(E_Border *b)
 {
-   if (b->desk != e_desktops_get(e_desktops_get_current()))
+   if (b->desk != e_desktops_get(0))
      return 0;
 
    if (b->current.x + b->current.w <= 0)
diff --git a/src/fs.c b/src/fs.c
index 5c8680a20..3bd3cb6dc 100644
--- a/src/fs.c
+++ b/src/fs.c
@@ -168,6 +168,7 @@ void
 e_fs_init(void)
 {
    e_event_filter_handler_add(EV_CHILD, e_fs_child_handle);   
+   e_event_filter_idle_handler_add(e_fs_idle, NULL);   
    _e_fs_restarter(0, NULL);
 }