diff --git a/src/core/lv_indev.c b/src/core/lv_indev.c
index c4bd23ab7fb3..3348bd6be18b 100644
--- a/src/core/lv_indev.c
+++ b/src/core/lv_indev.c
@@ -709,13 +709,13 @@ static void indev_encoder_proc(lv_indev_t * i, lv_indev_data_t * data)
             int32_t s;
             if(data->enc_diff < 0) {
                 for(s = 0; s < -data->enc_diff; s++) {
-                	lv_group_send_data(g, LV_KEY_LEFT);
+                    lv_group_send_data(g, LV_KEY_LEFT);
                     if(indev_reset_check(&i->proc)) return;
                 }
             }
             else if(data->enc_diff > 0) {
                 for(s = 0; s < data->enc_diff; s++) {
-                	lv_group_send_data(g, LV_KEY_RIGHT);
+                    lv_group_send_data(g, LV_KEY_RIGHT);
                     if(indev_reset_check(&i->proc)) return;
                 }
             }
@@ -726,13 +726,13 @@ static void indev_encoder_proc(lv_indev_t * i, lv_indev_data_t * data)
             int32_t s;
             if(data->enc_diff < 0) {
                 for(s = 0; s < -data->enc_diff; s++) {
-                	lv_group_focus_prev(g);
+                    lv_group_focus_prev(g);
                     if(indev_reset_check(&i->proc)) return;
                 }
             }
             else if(data->enc_diff > 0) {
                 for(s = 0; s < data->enc_diff; s++) {
-                	lv_group_focus_next(g);
+                    lv_group_focus_next(g);
                     if(indev_reset_check(&i->proc)) return;
                 }
             }
diff --git a/src/extra/widgets/keyboard/lv_keyboard.c b/src/extra/widgets/keyboard/lv_keyboard.c
index 6ba431eb9ec5..8e052e33a1c3 100644
--- a/src/extra/widgets/keyboard/lv_keyboard.c
+++ b/src/extra/widgets/keyboard/lv_keyboard.c
@@ -285,19 +285,19 @@ void lv_keyboard_def_event_cb(lv_event_t * e)
     if(strcmp(txt, "abc") == 0) {
         keyboard->mode = LV_KEYBOARD_MODE_TEXT_LOWER;
         lv_btnmatrix_set_map(obj, kb_map[LV_KEYBOARD_MODE_TEXT_LOWER]);
-        lv_btnmatrix_set_ctrl_map(obj, kb_ctrl[LV_KEYBOARD_MODE_TEXT_LOWER]);
+        lv_keyboard_update_ctrl_map(obj);
         return;
     }
     else if(strcmp(txt, "ABC") == 0) {
         keyboard->mode = LV_KEYBOARD_MODE_TEXT_UPPER;
         lv_btnmatrix_set_map(obj, kb_map[LV_KEYBOARD_MODE_TEXT_UPPER]);
-        lv_btnmatrix_set_ctrl_map(obj, kb_ctrl[LV_KEYBOARD_MODE_TEXT_UPPER]);
+        lv_keyboard_update_ctrl_map(obj);
         return;
     }
     else if(strcmp(txt, "1#") == 0) {
         keyboard->mode = LV_KEYBOARD_MODE_SPECIAL;
         lv_btnmatrix_set_map(obj, kb_map[LV_KEYBOARD_MODE_SPECIAL]);
-        lv_btnmatrix_set_ctrl_map(obj, kb_ctrl[LV_KEYBOARD_MODE_SPECIAL]);
+        lv_keyboard_update_ctrl_map(obj);
         return;
     }
     else if(strcmp(txt, LV_SYMBOL_CLOSE) == 0 || strcmp(txt, LV_SYMBOL_KEYBOARD) == 0) {