diff --git a/src/lib/efl_wl/efl_wl.c b/src/lib/efl_wl/efl_wl.c
index 28a0814710..40667cabf9 100644
--- a/src/lib/efl_wl/efl_wl.c
+++ b/src/lib/efl_wl/efl_wl.c
@@ -2321,6 +2321,9 @@ comp_surface_smart_del(Evas_Object *obj)
 {
    Comp_Surface *cs = evas_object_smart_data_get(obj);
 
+   if ((cs->c) && (cs->c->active_surface == cs))
+     cs->c->active_surface = NULL;
+
    array_clear(&cs->input_rects);
    array_clear(&cs->opaque_rects);
    eina_tiler_free(cs->opaque);