diff --git a/TODO b/TODO
index a522e61bc..250234348 100644
--- a/TODO
+++ b/TODO
@@ -33,7 +33,7 @@ Some of the things (in very short form) that need to be done to E17...
   a big xev (xev -g 1280x1024) that wont fit it gets placed offscreen to the
   right of zone 2
 * 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
+* BUG?: xine's ui window/panel is under its video window when u go fullscreen
 ]]]
 
 [[[
diff --git a/src/bin/e_border.c b/src/bin/e_border.c
index 1c13b6614..7688b2d3a 100644
--- a/src/bin/e_border.c
+++ b/src/bin/e_border.c
@@ -1203,7 +1203,7 @@ e_border_maximize(E_Border *bd, E_Maximize max)
 	      break;
 	  }
 
-	if (bd->maximized)
+	if (bd->maximized > E_MAXIMIZE_FULLSCREEN)
 	  {
 	     edje_object_signal_emit(bd->bg_object, "maximize", "");
 	     e_hints_window_maximized_set(bd, 1);
@@ -3978,6 +3978,17 @@ _e_border_eval(E_Border *bd)
 					     _e_border_cb_signal_drag, bd);
 	     if (bd->focused)
 	       edje_object_signal_emit(bd->bg_object, "active", "");
+	     if (bd->shaded)
+	       edje_object_signal_emit(bd->bg_object, "shaded", "");
+	     if (bd->maximized == E_MAXIMIZE_FULLSCREEN)
+	       edje_object_signal_emit(bd->bg_object, "maximize,fullscreen", "");
+	     else if (bd->maximized > E_MAXIMIZE_FULLSCREEN)
+	       edje_object_signal_emit(bd->bg_object, "maximize", "");
+	     if (bd->fullscreen)
+	       edje_object_signal_emit(bd->bg_object, "fullscreen", "");
+	     if (bd->hung)
+	       edje_object_signal_emit(bd->bg_object, "hung", "");
+	     
 	     evas_object_move(bd->bg_object, 0, 0);
 	     evas_object_resize(bd->bg_object, bd->w, bd->h);
 	     evas_object_show(bd->bg_object);