diff --git a/src/bin/e_border.c b/src/bin/e_border.c
index 58171378d..986217c55 100644
--- a/src/bin/e_border.c
+++ b/src/bin/e_border.c
@@ -4714,6 +4714,8 @@ _e_border_cb_mouse_out(void *data, int type, void *event)
 #endif
    bd->mouse.current.mx = ev->root.x;
    bd->mouse.current.my = ev->root.y;
+   if (ev->mode == ECORE_X_EVENT_MODE_GRAB)
+     evas_event_feed_mouse_cancel(bd->bg_evas, ev->time, NULL);
    evas_event_feed_mouse_out(bd->bg_evas, ev->time, NULL);
    return 1;
 }
diff --git a/src/bin/e_container.c b/src/bin/e_container.c
index ff048baf5..cdc7f6d0b 100644
--- a/src/bin/e_container.c
+++ b/src/bin/e_container.c
@@ -1063,6 +1063,8 @@ _e_container_cb_mouse_out(void *data, int type, void *event)
    if (con)
      {
 	_e_container_modifiers_update(con->bg_evas, ev->modifiers);
+	if (ev->mode == ECORE_X_EVENT_MODE_GRAB)
+	  evas_event_feed_mouse_cancel(con->bg_evas, ev->time, NULL);
         evas_event_feed_mouse_out(con->bg_evas, ev->time, NULL);
      }
    return 1;
diff --git a/src/bin/e_utils.c b/src/bin/e_utils.c
index 71cfb1759..0c1e0da41 100644
--- a/src/bin/e_utils.c
+++ b/src/bin/e_utils.c
@@ -41,6 +41,7 @@ e_util_container_fake_mouse_up_later(E_Container *con, int button)
    E_OBJECT_CHECK(con);
    E_OBJECT_TYPE_CHECK(con, E_CONTAINER_TYPE);
 
+   printf("FIXME: NO MORE CONTAINER FAKE UP! MUST REMOVE CODE\n");
    e_util_evas_fake_mouse_up_later(con->bg_evas, button);
 }
 
@@ -60,6 +61,8 @@ e_util_evas_fake_mouse_up_later(Evas *e, int button)
 {
    E_Util_Fake_Mouse_Up_Info *info;
 
+   printf("FIXME: NO MORE FAKE UP! MUST REMOVE CODE\n");
+   return;
    info = calloc(1, sizeof(E_Util_Fake_Mouse_Up_Info));
    if (info)
      {