diff --git a/src/bin/e_border.c b/src/bin/e_border.c
index a730a4769..e3b82a5d8 100644
--- a/src/bin/e_border.c
+++ b/src/bin/e_border.c
@@ -593,12 +593,13 @@ e_border_hide(E_Border *bd, int manage)
 	     if (e_config->focus_revert_on_hide_or_close)
 	       e_desk_last_focused_focus(bd->desk);
 	  }
-	if (manage)
+	if (manage == 1)
 	  {
 	     /* Make sure that this border isn't deleted */
 	     bd->await_hide_event++;
 	  }
-	ecore_x_window_hide(bd->client.win);
+	if (manage != 2)
+	  ecore_x_window_hide(bd->client.win);
      }
    
    visible = 0;
@@ -2822,9 +2823,11 @@ _e_border_cb_window_hide(void *data, int ev_type, void *ev)
      {
 	if (bd->await_hide_event > 0)
 	  bd->await_hide_event--;
-	/* Only hide the border if it is visible */
-	if (bd->visible)
-	  e_border_hide(bd, 1);
+	else
+	  {
+	     /* Only hide the border if it is visible */
+	     if (bd->visible) e_border_hide(bd, 1);
+	  }
      }
    else
      {
diff --git a/src/bin/e_desk.c b/src/bin/e_desk.c
index a91b27a8b..07af1dbfd 100644
--- a/src/bin/e_desk.c
+++ b/src/bin/e_desk.c
@@ -232,7 +232,7 @@ e_desk_show(E_Desk *desk)
 		   */
 		  if (bd->fullscreen)
 		    bd->want_fullscreen = 1;
-		  e_border_hide(bd, 1);
+		  e_border_hide(bd, 2);
 	       }
 	  }
      }
diff --git a/src/bin/e_widget.c b/src/bin/e_widget.c
index eac84f13e..caf3ef1aa 100644
--- a/src/bin/e_widget.c
+++ b/src/bin/e_widget.c
@@ -18,12 +18,16 @@ struct _E_Smart_Data
    void         (*del_func) (Evas_Object *obj);
    void         (*focus_func) (Evas_Object *obj);
    void         (*activate_func) (Evas_Object *obj);
+   void         (*disable_func) (Evas_Object *obj);
    void         (*on_focus_func) (void *data, Evas_Object *obj);
    void          *on_focus_data;
+   void         (*on_change_func) (void *data, Evas_Object *obj);
+   void          *on_change_data;
    void          *data;
    unsigned char  can_focus : 1;
    unsigned char  child_can_focus : 1;
    unsigned char  focused : 1;
+   unsigned char  disabled : 1;
 }; 
 
 /* local subsystem functions */
@@ -76,6 +80,13 @@ e_widget_activate_hook_set(Evas_Object *obj, void (*func) (Evas_Object *obj))
    sd->activate_func = func;
 }
 
+void
+e_widget_disable_hook_set(Evas_Object *obj, void (*func) (Evas_Object *obj))
+{
+   API_ENTRY return;
+   sd->disable_func = func;
+}
+
 void
 e_widget_on_focus_hook_set(Evas_Object *obj, void (*func) (void *data, Evas_Object *obj), void *data)
 {
@@ -84,6 +95,14 @@ e_widget_on_focus_hook_set(Evas_Object *obj, void (*func) (void *data, Evas_Obje
    sd->on_focus_data = data;
 }
 
+void
+e_widget_on_change_hook_set(Evas_Object *obj, void (*func) (void *data, Evas_Object *obj), void *data)
+{
+   API_ENTRY return;
+   sd->on_change_func = func;
+   sd->on_change_data = data;
+}
+
 void
 e_widget_data_set(Evas_Object *obj, void *data)
 {
@@ -183,7 +202,10 @@ int
 e_widget_focus_jump(Evas_Object *obj, int forward)
 {
    API_ENTRY return 0;
-   if (!e_widget_can_focus_get(obj)) return 0;
+   if ((!e_widget_can_focus_get(obj)) ||
+       (e_widget_disabled_get(obj)))
+     return 0;
+       
    /* if it has a focus func its an end-point widget like a button */
    if (sd->focus_func)
      {
@@ -213,7 +235,8 @@ e_widget_focus_jump(Evas_Object *obj, int forward)
 	       {
 		  for (l = sd->subobjs; l; l = l->next)
 		    {
-		       if (e_widget_can_focus_get(l->data))
+		       if ((e_widget_can_focus_get(l->data)) &&
+			   (!e_widget_disabled_get(l->data)))
 			 {
 			    if (focus_next)
 			      {
@@ -239,7 +262,8 @@ e_widget_focus_jump(Evas_Object *obj, int forward)
 	       {
 		  for (l = evas_list_last(sd->subobjs); l; l = l->prev)
 		    {
-		       if (e_widget_can_focus_get(l->data))
+		       if ((e_widget_can_focus_get(l->data)) &&
+			   (!e_widget_disabled_get(l->data)))
 			 {
 			    if (focus_next)
 			      {
@@ -290,7 +314,8 @@ e_widget_focus_set(Evas_Object *obj, int first)
 	  {
 	     for (l = sd->subobjs; l; l = l->next)
 	       {
-		  if (e_widget_can_focus_get(l->data))
+		  if ((e_widget_can_focus_get(l->data)) &&
+		      (!e_widget_disabled_get(l->data)))
 		    {
 		       e_widget_focus_set(l->data, first);
 		       break;
@@ -301,7 +326,8 @@ e_widget_focus_set(Evas_Object *obj, int first)
 	  {
 	     for (l = evas_list_last(sd->subobjs); l; l = l->prev)
 	       {
-		  if (e_widget_can_focus_get(l->data))
+		  if ((e_widget_can_focus_get(l->data)) &&
+		      (!e_widget_disabled_get(l->data)))
 		    {
 		       e_widget_focus_set(l->data, first);
 		       break;
@@ -342,6 +368,7 @@ e_widget_focus_steal(Evas_Object *obj)
    Evas_Object *parent, *o;
    API_ENTRY return;
    if (sd->focused) return;
+   if (sd->disabled) return;
    parent = obj;
    for (;;)
      {
@@ -370,6 +397,29 @@ e_widget_activate(Evas_Object *obj)
 {
    API_ENTRY return;
    if (sd->activate_func) sd->activate_func(obj);
+   e_widget_change(obj);
+}
+
+void
+e_widget_change(Evas_Object *obj)
+{
+   API_ENTRY return;
+   if (sd->on_change_func) sd->on_change_func(sd->on_change_data, obj);
+}
+
+void
+e_widget_disabled_set(Evas_Object *obj, int disabled)
+{
+   API_ENTRY return;
+   sd->disabled = disabled;
+   if (sd->disable_func) sd->disable_func(obj);
+}
+
+int
+e_widget_disabled_get(Evas_Object *obj)
+{
+   API_ENTRY return 0;
+   return sd->disabled;
 }
 
 /* local subsystem functions */
diff --git a/src/bin/e_widget.h b/src/bin/e_widget.h
index bf877795d..a5a27701d 100644
--- a/src/bin/e_widget.h
+++ b/src/bin/e_widget.h
@@ -10,7 +10,9 @@ EAPI Evas_Object *e_widget_add(Evas *evas);
 EAPI void e_widget_del_hook_set(Evas_Object *obj, void (*func) (Evas_Object *obj));
 EAPI void e_widget_focus_hook_set(Evas_Object *obj, void (*func) (Evas_Object *obj));
 EAPI void e_widget_activate_hook_set(Evas_Object *obj, void (*func) (Evas_Object *obj));
+EAPI void e_widget_disable_hook_set(Evas_Object *obj, void (*func) (Evas_Object *obj));
 EAPI void e_widget_on_focus_hook_set(Evas_Object *obj, void (*func) (void *data, Evas_Object *obj), void *data);
+EAPI void e_widget_on_change_hook_set(Evas_Object *obj, void (*func) (void *data, Evas_Object *obj), void *data);
 EAPI void e_widget_data_set(Evas_Object *obj, void *data);
 EAPI void *e_widget_data_get(Evas_Object *obj);
 EAPI void e_widget_min_size_set(Evas_Object *obj, Evas_Coord minw, Evas_Coord minh);
@@ -27,6 +29,9 @@ EAPI void e_widget_focused_object_clear(Evas_Object *obj);
 EAPI Evas_Object *e_widget_parent_get(Evas_Object *obj);
 EAPI void e_widget_focus_steal(Evas_Object *obj);
 EAPI void e_widget_activate(Evas_Object *obj);
-
+EAPI void e_widget_change(Evas_Object *obj);
+EAPI void e_widget_disabled_set(Evas_Object *obj, int disabled);
+EAPI int  e_widget_disabled_get(Evas_Object *obj);
+    
 #endif
 #endif
diff --git a/src/bin/e_widget_button.c b/src/bin/e_widget_button.c
index 3bcee464a..b8e68fa3b 100644
--- a/src/bin/e_widget_button.c
+++ b/src/bin/e_widget_button.c
@@ -110,6 +110,7 @@ _e_wid_signal_cb1(void *data, Evas_Object *obj, const char *emission, const char
 {
    e_widget_focus_steal(data);
    _e_wid_activate_hook(data);
+   e_widget_change(data);
 }
 
 static void
diff --git a/src/bin/e_widget_check.c b/src/bin/e_widget_check.c
index 86e4ee18a..5b2cecf40 100644
--- a/src/bin/e_widget_check.c
+++ b/src/bin/e_widget_check.c
@@ -115,6 +115,7 @@ static void
 _e_wid_signal_cb1(void *data, Evas_Object *obj, const char *emission, const char *source)
 {
    _e_wid_do(data);
+   e_widget_change(data);
 }
 
 static void
diff --git a/src/bin/e_widget_radio.c b/src/bin/e_widget_radio.c
index cda2f4246..cecda969e 100644
--- a/src/bin/e_widget_radio.c
+++ b/src/bin/e_widget_radio.c
@@ -155,6 +155,7 @@ static void
 _e_wid_signal_cb1(void *data, Evas_Object *obj, const char *emission, const char *source)
 {
    _e_wid_do(data);
+   e_widget_change(data);
 }
 
 static void