diff --git a/src/core/lv_indev.c b/src/core/lv_indev.c
index 2e16b8e5f6..2cf0675eb2 100644
--- a/src/core/lv_indev.c
+++ b/src/core/lv_indev.c
@@ -839,11 +839,6 @@ static void indev_proc_press(_lv_indev_proc_t * proc)
             if(indev_reset_check(proc)) return;
 
             if(indev_act->proc.wait_until_release) return;
-
-            /*Handle focus*/
-            indev_click_focus(&indev_act->proc);
-            if(indev_reset_check(proc)) return;
-
         }
     }
 
@@ -923,6 +918,11 @@ static void indev_proc_release(_lv_indev_proc_t * proc)
 
         /*Send CLICK if no scrolling*/
         if(scroll_obj == NULL) {
+
+            /*Handle focus*/
+            indev_click_focus(&indev_act->proc);
+            if(indev_reset_check(proc)) return;
+
             if(proc->long_pr_sent == 0) {
                 lv_event_send(indev_obj_act, LV_EVENT_SHORT_CLICKED, indev_act);
                 if(indev_reset_check(proc)) return;