diff --git a/legacy/elementary/src/lib/elm_clock.c b/legacy/elementary/src/lib/elm_clock.c
index 3e20ea692c..9220af6630 100644
--- a/legacy/elementary/src/lib/elm_clock.c
+++ b/legacy/elementary/src/lib/elm_clock.c
@@ -724,10 +724,10 @@ _elm_clock_smart_focus_next(Eo *obj, void *_pd EINA_UNUSED, va_list *list)
    if (!sd->edit)
      {
         *next = (Evas_Object *)obj;
-        if (ret) *ret = !elm_widget_focus_get(obj);
+        if (ret) *ret = !elm_widget_highlight_get(obj);
         return;
      }
-   else if (!elm_widget_focus_get(obj))
+   else if (!elm_widget_highlight_get(obj))
      {
         *next = (Evas_Object *)obj;
         if (ret) *ret = EINA_TRUE;
diff --git a/legacy/elementary/src/lib/elm_genlist.c b/legacy/elementary/src/lib/elm_genlist.c
index 4b622ed688..a48f081f4d 100644
--- a/legacy/elementary/src/lib/elm_genlist.c
+++ b/legacy/elementary/src/lib/elm_genlist.c
@@ -7321,6 +7321,9 @@ _class_constructor(Eo_Class *klass)
         EO_OP_FUNC_SENTINEL
    };
    eo_class_funcs_set(klass, func_desc);
+
+   if (_elm_config->access_mode)
+      _elm_genlist_smart_focus_next_enable = EINA_TRUE;
 }
 
 static const Eo_Op_Description op_desc[] = {