diff --git a/src/bin/e_border.c b/src/bin/e_border.c
index 4da452dc9..311b2ffc0 100644
--- a/src/bin/e_border.c
+++ b/src/bin/e_border.c
@@ -1435,7 +1435,7 @@ e_border_focus_set(E_Border *bd, int focus, int set)
 	  {
 	     if ((bd->visible) && (bd->changes.visible))
 	       {
-		  e_border_focus_latest_set(bd);
+////		  e_border_focus_latest_set(bd);
 		  bd->want_focus = 1;
 		  bd->changed = 1;
 		  return;
@@ -1448,7 +1448,7 @@ e_border_focus_set(E_Border *bd, int focus, int set)
 	  {
 	     if ((bd->visible) && (bd->changes.visible))
 	       {
-		  e_border_focus_latest_set(bd);
+////		  e_border_focus_latest_set(bd);
 		  bd->want_focus = 1;
 		  bd->changed = 1;
 		  return;
@@ -1465,7 +1465,7 @@ e_border_focus_set(E_Border *bd, int focus, int set)
      }
    if ((!bd->visible) && (focus))
      {
-	e_border_focus_latest_set(bd);
+////	e_border_focus_latest_set(bd);
 	bd->want_focus = 1;
 	bd->changed = 1;
 	return;
@@ -1474,7 +1474,7 @@ e_border_focus_set(E_Border *bd, int focus, int set)
      {
 	if ((bd->visible) && (bd->changes.visible))
 	  {
-	     e_border_focus_latest_set(bd);
+////	     e_border_focus_latest_set(bd);
 	     bd->want_focus = 1;
 	     bd->changed = 1;
 	     return;
@@ -1483,10 +1483,11 @@ e_border_focus_set(E_Border *bd, int focus, int set)
 	  {
 	     if (focus_track_frozen == 0)
 	       {
-		  e_border_focus_latest_set(bd);
+////		  e_border_focus_latest_set(bd);
 	       }
 	  }
 //	printf("EMIT 0x%x activeve\n", bd->client.win);
+	e_border_focus_latest_set(bd);
 	edje_object_signal_emit(bd->bg_object, "e,state,focused", "e");
 	if (bd->icon_object)
 	  edje_object_signal_emit(bd->icon_object, "e,state,focused", "e");