diff --git a/src/bin/e_client.c b/src/bin/e_client.c
index ee2cf6496..03e0d025f 100644
--- a/src/bin/e_client.c
+++ b/src/bin/e_client.c
@@ -3807,7 +3807,6 @@ e_client_unstick(E_Client *ec)
           }
      }
 
-   e_comp_object_signal_emit(ec->frame, "e,state,unsticky", "e");
    _e_client_event_property(ec, E_CLIENT_PROPERTY_STICKY);
 
    e_client_desk_set(ec, e_desk_current_get(ec->zone));
diff --git a/src/bin/e_comp_object.c b/src/bin/e_comp_object.c
index 1571a77b9..30f0c28fe 100644
--- a/src/bin/e_comp_object.c
+++ b/src/bin/e_comp_object.c
@@ -1738,6 +1738,12 @@ _e_comp_smart_cb_unfullscreen(void *data, Evas_Object *obj, void *event_info EIN
      }
 }
 
+static void
+_e_comp_smart_cb_sticky(void *data EINA_UNUSED, Evas_Object *obj, void *event_info EINA_UNUSED)
+{
+   e_comp_object_signal_emit(obj, "e,state,sticky", "e");
+}
+
 static void
 _e_comp_smart_cb_unsticky(void *data EINA_UNUSED, Evas_Object *obj, void *event_info EINA_UNUSED)
 {
@@ -1810,7 +1816,8 @@ _e_comp_smart_add(Evas_Object *obj)
    evas_object_smart_callback_add(obj, "unmaximize", _e_comp_smart_cb_unmaximize, cw);
    evas_object_smart_callback_add(obj, "unfullscreen", _e_comp_smart_cb_unfullscreen, cw);
 
-   evas_object_smart_callback_add(obj, "unsticky", _e_comp_smart_cb_unsticky, cw);
+   evas_object_smart_callback_add(obj, "stick", _e_comp_smart_cb_sticky, cw);
+   evas_object_smart_callback_add(obj, "unstick", _e_comp_smart_cb_unsticky, cw);
 
    evas_object_smart_callback_add(obj, "hung", _e_comp_smart_cb_hung, cw);
    evas_object_smart_callback_add(obj, "unhung", _e_comp_smart_cb_unhung, cw);