diff --git a/src/bin/mainview/edi_mainview.c b/src/bin/mainview/edi_mainview.c
index 7fc88c1..12c3f35 100644
--- a/src/bin/mainview/edi_mainview.c
+++ b/src/bin/mainview/edi_mainview.c
@@ -813,6 +813,7 @@ edi_mainview_goto_popup_show()
 
    input = elm_entry_add(box);
    elm_entry_single_line_set(input, EINA_TRUE);
+   elm_entry_scrollable_set(input, EINA_TRUE);
    evas_object_event_callback_add(input, EVAS_CALLBACK_KEY_UP, _edi_mainview_goto_popup_key_up_cb, NULL);
    evas_object_size_hint_weight_set(input, EVAS_HINT_FILL, EVAS_HINT_FILL);
    evas_object_size_hint_align_set(input, EVAS_HINT_FILL, EVAS_HINT_FILL);
@@ -874,6 +875,7 @@ edi_mainview_project_search_popup_show(void)
 
    input = elm_entry_add(box);
    elm_entry_single_line_set(input, EINA_TRUE);
+   elm_entry_scrollable_set(input, EINA_TRUE);
    evas_object_event_callback_add(input, EVAS_CALLBACK_KEY_UP, _edi_mainview_goto_popup_key_up_cb, NULL);
    evas_object_size_hint_weight_set(input, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
    evas_object_size_hint_align_set(input, EVAS_HINT_FILL, EVAS_HINT_FILL);
diff --git a/src/bin/screens/edi_file_screens.c b/src/bin/screens/edi_file_screens.c
index 609ec12..110b20a 100644
--- a/src/bin/screens/edi_file_screens.c
+++ b/src/bin/screens/edi_file_screens.c
@@ -187,6 +187,7 @@ edi_file_screens_rename(Evas_Object *parent, const char *path)
    input = elm_entry_add(box);
    elm_entry_single_line_set(input, EINA_TRUE);
    elm_entry_editable_set(input, EINA_TRUE);
+   elm_entry_scrollable_set(input, EINA_TRUE);
    elm_object_text_set(input, leaf);
    evas_object_size_hint_weight_set(input, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
    evas_object_size_hint_align_set(input, EVAS_HINT_FILL, EVAS_HINT_FILL);
@@ -227,6 +228,7 @@ edi_file_screens_create_file(Evas_Object *parent, const char *directory)
 
    input = elm_entry_add(box);
    elm_entry_single_line_set(input, EINA_TRUE);
+   elm_entry_scrollable_set(input, EINA_TRUE);
    evas_object_size_hint_weight_set(input, EVAS_HINT_FILL, EVAS_HINT_FILL);
    evas_object_size_hint_align_set(input, EVAS_HINT_FILL, EVAS_HINT_FILL);
    evas_object_show(input);
@@ -266,6 +268,7 @@ edi_file_screens_create_dir(Evas_Object *parent, const char *directory)
 
    input = elm_entry_add(box);
    elm_entry_single_line_set(input, EINA_TRUE);
+   elm_entry_scrollable_set(input, EINA_TRUE);
    evas_object_size_hint_weight_set(input, EVAS_HINT_FILL, EVAS_HINT_FILL);
    evas_object_size_hint_align_set(input, EVAS_HINT_FILL, EVAS_HINT_FILL);
    evas_object_show(input);
diff --git a/src/bin/screens/edi_settings.c b/src/bin/screens/edi_settings.c
index 584ca1b..95a73f4 100644
--- a/src/bin/screens/edi_settings.c
+++ b/src/bin/screens/edi_settings.c
@@ -172,6 +172,8 @@ _edi_settings_display_create(Evas_Object *parent)
    evas_object_smart_callback_add(button, "clicked",
                                   _edi_settings_font_choose_cb, parent);
 
+   elm_object_focus_set(button, EINA_TRUE);
+
    check = elm_check_add(box);
    elm_object_text_set(check, "Display whitespace");
    elm_check_state_set(check, _edi_project_config->gui.show_whitespace);
@@ -325,6 +327,8 @@ _edi_settings_builds_create(Evas_Object *parent)
    elm_box_pack_end(hbox, selector);
    evas_object_show(selector);
 
+   elm_object_focus_set(selector, EINA_TRUE);
+
    file = elm_label_add(hbox);
    elm_object_text_set(file, _edi_project_config->launch.path);
    evas_object_size_hint_weight_set(file, 0.75, 0.0);
@@ -561,6 +565,8 @@ _edi_settings_behaviour_create(Evas_Object *parent)
                                   _edi_settings_behaviour_autosave_cb, NULL);
    evas_object_show(check);
 
+   elm_object_focus_set(check, EINA_TRUE);
+
    check = elm_check_add(box);
    elm_object_text_set(check, "Trim trailing whitespace");
    elm_check_state_set(check, _edi_config->trim_whitespace);