diff --git a/TODO b/TODO
index 68b553be8..15a1b06c8 100644
--- a/TODO
+++ b/TODO
@@ -29,7 +29,6 @@ Current freeze issues are:
 
 ISSUES:
 
-* restart is still broken. eg: start xmms. bring up playlist. close playlist window. restart. playlist window comes back - it shouldn't!
 * clock module needs fixing to have right click menu per face
 * clock module should only make 1 clock per container and allow u to enable/disable that clock on that container 
 * same for ibar, temperature and battery modules
diff --git a/src/bin/e_border.c b/src/bin/e_border.c
index bcc1ea4b8..faaa5df50 100644
--- a/src/bin/e_border.c
+++ b/src/bin/e_border.c
@@ -337,6 +337,7 @@ e_border_show(E_Border *bd)
 
    visible = 1;
    ecore_x_window_prop_card32_set(bd->client.win, E_ATOM_MAPPED, &visible, 1);
+   ecore_x_window_prop_card32_set(bd->client.win, E_ATOM_MANAGED, &visible, 1);
    
    ev = calloc(1, sizeof(E_Event_Border_Show));
    ev->border = bd;
@@ -370,6 +371,7 @@ e_border_hide(E_Border *bd)
 
    visible = 0;
    ecore_x_window_prop_card32_set(bd->client.win, E_ATOM_MAPPED, &visible, 1);
+   ecore_x_window_prop_card32_set(bd->client.win, E_ATOM_MANAGED, &visible, 1);
    
    ev = calloc(1, sizeof(E_Event_Border_Hide));
    ev->border = bd;