diff --git a/src/lv_widgets/lv_list.c b/src/lv_widgets/lv_list.c
index 912bdba14..8294968a1 100644
--- a/src/lv_widgets/lv_list.c
+++ b/src/lv_widgets/lv_list.c
@@ -254,12 +254,12 @@ bool lv_list_remove(const lv_obj_t * list, uint16_t index)
     uint16_t count = 0;
     lv_obj_t * e   = lv_list_get_next_btn(list, NULL);
     while(e != NULL) {
-#if LV_USE_GROUP
-        if(e == ext->last_sel_btn) ext->last_sel_btn = NULL;
-#endif
-        if(e == ext->act_sel_btn) ext->act_sel_btn = NULL;
-
         if(count == index) {
+#if LV_USE_GROUP
+            if(e == ext->last_sel_btn) ext->last_sel_btn = NULL;
+#endif
+            if(e == ext->act_sel_btn) ext->act_sel_btn = NULL;
+
             lv_obj_del(e);
             return true;
         }