diff --git a/legacy/elementary/src/lib/elm_button.c b/legacy/elementary/src/lib/elm_button.c
index d89916f1a4..e1f3da85d0 100644
--- a/legacy/elementary/src/lib/elm_button.c
+++ b/legacy/elementary/src/lib/elm_button.c
@@ -185,9 +185,9 @@ _elm_button_smart_event(Eo *obj, void *_pd EINA_UNUSED, va_list *list)
      return;
 
    _activate(obj);
-   ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD;
    elm_layout_signal_emit(obj, "elm,anim,activate", "elm");
 
+   ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD;
    if (ret) *ret = EINA_TRUE;
 }
 
diff --git a/legacy/elementary/src/lib/elm_check.c b/legacy/elementary/src/lib/elm_check.c
index e7595e8870..1ce37abd09 100644
--- a/legacy/elementary/src/lib/elm_check.c
+++ b/legacy/elementary/src/lib/elm_check.c
@@ -164,8 +164,8 @@ _elm_check_smart_event(Eo *obj, void *_pd EINA_UNUSED, va_list *list)
      return;
 
    _activate(obj);
-   ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD;
 
+   ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD;
    if (ret) *ret = EINA_TRUE;
 }
 
diff --git a/legacy/elementary/src/lib/elm_colorselector.c b/legacy/elementary/src/lib/elm_colorselector.c
index e7f0c799ac..d471ea671b 100644
--- a/legacy/elementary/src/lib/elm_colorselector.c
+++ b/legacy/elementary/src/lib/elm_colorselector.c
@@ -1744,6 +1744,7 @@ _elm_colorselector_smart_event(Eo *obj, void *_pd, va_list *list)
      }
    else if (!cl && sd->focused == ELM_COLORSELECTOR_PALETTE)
      return;
+
    ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD;
    if (ret) *ret = EINA_TRUE;
 }
diff --git a/legacy/elementary/src/lib/elm_diskselector.c b/legacy/elementary/src/lib/elm_diskselector.c
index 78424bc34f..6135dd84f0 100644
--- a/legacy/elementary/src/lib/elm_diskselector.c
+++ b/legacy/elementary/src/lib/elm_diskselector.c
@@ -1009,7 +1009,6 @@ _elm_diskselector_smart_event(Eo *obj, void *_pd, va_list *list)
      }
 
    ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD;
-
    if (ret) *ret = EINA_TRUE;
 }
 
diff --git a/legacy/elementary/src/lib/elm_flipselector.c b/legacy/elementary/src/lib/elm_flipselector.c
index 5d09a9cd93..736cd37a3b 100644
--- a/legacy/elementary/src/lib/elm_flipselector.c
+++ b/legacy/elementary/src/lib/elm_flipselector.c
@@ -466,7 +466,6 @@ _elm_flipselector_smart_event(Eo *obj, void *_pd, va_list *list)
    _flipselector_unwalk(sd);
 
    ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD;
-
    if (ret) *ret = EINA_TRUE;
 }
 
diff --git a/legacy/elementary/src/lib/elm_image.c b/legacy/elementary/src/lib/elm_image.c
index bda4fe4b53..e304e4b471 100644
--- a/legacy/elementary/src/lib/elm_image.c
+++ b/legacy/elementary/src/lib/elm_image.c
@@ -658,8 +658,8 @@ _elm_image_smart_event(Eo *obj, void *_pd EINA_UNUSED, va_list *list)
      return;
 
    _activate(obj);
-   ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD;
 
+   ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD;
    if (ret) *ret = EINA_TRUE;
 }
 
diff --git a/legacy/elementary/src/lib/elm_radio.c b/legacy/elementary/src/lib/elm_radio.c
index d30d6cc1b7..b6c9933aa4 100644
--- a/legacy/elementary/src/lib/elm_radio.c
+++ b/legacy/elementary/src/lib/elm_radio.c
@@ -168,8 +168,8 @@ _elm_radio_smart_event(Eo *obj, void *_pd EINA_UNUSED, va_list *list)
      return;
 
    _activate(obj);
-   ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD;
 
+   ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD;
    if (ret) *ret = EINA_TRUE;
 }
 
diff --git a/legacy/elementary/src/lib/elm_toolbar.c b/legacy/elementary/src/lib/elm_toolbar.c
index 9c6af1f5ce..245e037249 100644
--- a/legacy/elementary/src/lib/elm_toolbar.c
+++ b/legacy/elementary/src/lib/elm_toolbar.c
@@ -736,7 +736,6 @@ _elm_toolbar_smart_event(Eo *obj, void *_pd, va_list *list)
 
    ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD;
    if (ret) *ret = EINA_TRUE;
-   return;
 }
 
 static void