diff --git a/src/core/lv_obj.c b/src/core/lv_obj.c
index 8890fcbe0d..7b6bfcb3bc 100644
--- a/src/core/lv_obj.c
+++ b/src/core/lv_obj.c
@@ -278,6 +278,11 @@ void lv_obj_add_state(lv_obj_t * obj, lv_state_t state)
 
     lv_state_t new_state = obj->state | state;
     if(obj->state != new_state) {
+
+        if(new_state & LV_STATE_DISABLED) {
+            lv_indev_reset(NULL, obj);
+        }
+
         lv_obj_set_state(obj, new_state);
     }
 }