diff --git a/src/modules/xkbswitch/e_mod_config.c b/src/modules/xkbswitch/e_mod_config.c
index 36b544d44..61db703c2 100644
--- a/src/modules/xkbswitch/e_mod_config.c
+++ b/src/modules/xkbswitch/e_mod_config.c
@@ -362,10 +362,15 @@ _basic_create(E_Config_Dialog *cfd EINA_UNUSED, Evas *evas, E_Config_Dialog_Data
    if (mw < 220) mw = 220;
    if (mh < 160) mh = 160;
 
-   evas_object_resize(options, mw, mh);
+   evas_object_size_hint_min_set(options, mw, mh);
+   E_EXPAND(options);
+   E_FILL(options);
 
-   scroller = e_widget_scrollframe_simple_add(evas, options);
-   e_widget_size_min_set(scroller, 220, 160);
+   scroller = elm_scroller_add(e_win_evas_win_get(evas));
+   E_EXPAND(scroller);
+   E_FILL(scroller);
+   elm_scroller_bounce_set(scroller, 0, 0);
+   elm_object_content_set(scroller, options);
 
    e_widget_toolbook_page_append(mainn, NULL, _("Options"), scroller, 1, 1, 1, 1, 0.5, 0.0);