diff --git a/TODO b/TODO
index de30611e0..1284e67f8 100644
--- a/TODO
+++ b/TODO
@@ -20,9 +20,6 @@ Some of the things (in very short form) that need to be done to E17...
   windows on desktops vanish... there must be a race condition with a
   map/unmap event and something else... they still are around in x- just e
   hides them and never shows them again
-* BUG: quit app while in fullscreen black bg stays
-* BUG: if focus changes while in fullscreen, un-fullscreen the app and deal
-  with focus
 * BUG?: pager problems. Seems to loose or mess up windows sometimes.
 * BUG?: xine's ui window/panel is under its video window when u go
   fullscreen. is this correct?
diff --git a/src/bin/e_border.c b/src/bin/e_border.c
index 8b43f1fa9..a64f71607 100644
--- a/src/bin/e_border.c
+++ b/src/bin/e_border.c
@@ -556,6 +556,8 @@ e_border_hide(E_Border *bd, int manage)
    E_OBJECT_TYPE_CHECK(bd, E_BORDER_TYPE);
    if (!bd->visible) return;
    if (bd->moving) return;
+   if (bd->fullscreen)
+     e_border_unfullscreen(bd);
    if (bd->resize_mode != RESIZE_NONE)
      {
 	bd->resize_mode = RESIZE_NONE;
@@ -839,6 +841,8 @@ e_border_focus_set(E_Border *bd, int focus, int set)
      {
 	edje_object_signal_emit(bd->bg_object, "passive", "");
 	e_focus_event_focus_out(bd);
+	if (bd->fullscreen)
+	  e_border_unfullscreen(bd);
      }
    bd->focused = focus;
    if (set)