diff --git a/lv_objx/lv_btnm.c b/lv_objx/lv_btnm.c
index e54115786..e6158d28c 100644
--- a/lv_objx/lv_btnm.c
+++ b/lv_objx/lv_btnm.c
@@ -627,7 +627,7 @@ static lv_res_t lv_btnm_signal(lv_obj_t * btnm, lv_signal_t sign, void * param)
 
             }
             lv_obj_invalidate(btnm);
-        }else if(c == LV_GROUP_KEY_ENTER || c == LV_GROUP_KEY_ENTER_LONG) {
+        }else if(c == LV_GROUP_KEY_ENTER) {
             if(ext->action != NULL) {
                 uint16_t txt_i = get_button_text(btnm, ext->btn_id_pr);
                 if(txt_i != LV_BTNM_PR_NONE) {
diff --git a/lv_objx/lv_cb.c b/lv_objx/lv_cb.c
index d2867eda2..7363f44e8 100644
--- a/lv_objx/lv_cb.c
+++ b/lv_objx/lv_cb.c
@@ -305,7 +305,7 @@ static lv_res_t lv_cb_signal(lv_obj_t * cb, lv_signal_t sign, void * param)
         char c = *((char*)param);
         if(c == LV_GROUP_KEY_RIGHT || c == LV_GROUP_KEY_DOWN ||
            c == LV_GROUP_KEY_LEFT || c == LV_GROUP_KEY_UP ||
-           c == LV_GROUP_KEY_ENTER || c == LV_GROUP_KEY_ENTER_LONG) {
+           c == LV_GROUP_KEY_ENTER) {
             lv_btn_set_state(ext->bullet, lv_btn_get_state(cb));
         }
     }
diff --git a/lv_objx/lv_ddlist.c b/lv_objx/lv_ddlist.c
index 314fcdb2a..1aa8060bc 100644
--- a/lv_objx/lv_ddlist.c
+++ b/lv_objx/lv_ddlist.c
@@ -549,7 +549,7 @@ static lv_res_t lv_ddlist_signal(lv_obj_t * ddlist, lv_signal_t sign, void * par
                 lv_ddlist_pos_current_option(ddlist);
                 lv_obj_invalidate(ddlist);
             }
-        } else if(c == LV_GROUP_KEY_ENTER  || c == LV_GROUP_KEY_ENTER_LONG) {
+        } else if(c == LV_GROUP_KEY_ENTER) {
             if(ext->opened) {
                 ext->sel_opt_id_ori = ext->sel_opt_id;
                 ext->opened = 0;
diff --git a/lv_objx/lv_list.c b/lv_objx/lv_list.c
index f272efd22..282a64a31 100644
--- a/lv_objx/lv_list.c
+++ b/lv_objx/lv_list.c
@@ -570,7 +570,7 @@ static lv_res_t lv_list_signal(lv_obj_t * list, lv_signal_t sign, void * param)
                     lv_page_focus(list, btn_prev, ext->anim_time);
                 }
             }
-        } else if(c == LV_GROUP_KEY_ENTER || c == LV_GROUP_KEY_ENTER_LONG) {
+        } else if(c == LV_GROUP_KEY_ENTER) {
             /*Get the 'pressed' button*/
             lv_obj_t * btn = NULL;
             btn = get_next_btn(list, btn);
diff --git a/lv_objx/lv_roller.c b/lv_objx/lv_roller.c
index de9e33c17..0a02df7f5 100644
--- a/lv_objx/lv_roller.c
+++ b/lv_objx/lv_roller.c
@@ -321,8 +321,9 @@ static lv_res_t lv_roller_signal(lv_obj_t * roller, lv_signal_t sign, void * par
             if(ext->ddlist.sel_opt_id > 0) {
                 lv_roller_set_selected(roller, ext->ddlist.sel_opt_id - 1, true);
             }
-        } else if(c == LV_GROUP_KEY_ENTER || c == LV_GROUP_KEY_ENTER_LONG) {
+        } else if(c == LV_GROUP_KEY_ENTER) {
             if(ext->ddlist.action) ext->ddlist.action(roller);
+            ext->ddlist.sel_opt_id_ori = ext->ddlist.sel_opt_id;		/*Set the entered value as default*/
         }
     }
     else if(sign == LV_SIGNAL_GET_TYPE) {
diff --git a/lv_objx/lv_sw.c b/lv_objx/lv_sw.c
index 79495438e..274ca38a9 100644
--- a/lv_objx/lv_sw.c
+++ b/lv_objx/lv_sw.c
@@ -243,7 +243,7 @@ static lv_res_t lv_sw_signal(lv_obj_t * sw, lv_signal_t sign, void * param)
     else if(sign == LV_SIGNAL_CONTROLL) {
 
         char c = *((char*)param);
-        if(c == LV_GROUP_KEY_ENTER || c == LV_GROUP_KEY_ENTER_LONG) {
+        if(c == LV_GROUP_KEY_ENTER) {
             if(lv_sw_get_state(sw)) lv_sw_off(sw);
             else lv_sw_on(sw);