diff --git a/src/bin/e_comp.c b/src/bin/e_comp.c
index 6b6bd721f..b58d5b22a 100644
--- a/src/bin/e_comp.c
+++ b/src/bin/e_comp.c
@@ -2233,8 +2233,6 @@ _e_comp_win_add(E_Comp *c, Ecore_X_Window win, E_Border *bd)
         evas_object_image_colorspace_set(cw->obj, EVAS_COLORSPACE_ARGB8888);
         if (cw->argb) evas_object_image_alpha_set(cw->obj, 1);
         else evas_object_image_alpha_set(cw->obj, 0);
-        if (cw->override)
-          evas_object_pass_events_set(cw->effect_obj, EINA_TRUE);
 
         _e_comp_win_shadow_setup(cw);
         edje_object_part_swallow(cw->effect_obj, "e.swallow.content", cw->shobj);
@@ -3757,7 +3755,12 @@ _e_comp_shapes_update_comp_win_shape_comp_helper(E_Comp_Win *cw, Eina_Tiler *tb)
         SHAPE_INF("IGNORING DELETED: %u", cw->win);
         return;
      }
-   if (cw->invalid || cw->real_hid || (!cw->visible) || (!cw->shape->visible) || evas_object_pass_events_get(cw->effect_obj) || evas_object_pass_events_get(cw->shobj))
+   if (cw->override && cw->shaped)
+     {
+        ERR("SHAPED OVERRIDE WINDOW DETECTED: INPUT SHAPE CUTTING BROKEN!");
+        return;
+     }
+   if (cw->invalid || cw->real_hid || (!cw->visible) || (!cw->shape->visible) || evas_object_pass_events_get(cw->effect_obj))
      {
         SHAPE_DBG("SKIPPING SHAPE");
         return;