diff --git a/legacy/elementary/src/lib/elc_ctxpopup.c b/legacy/elementary/src/lib/elc_ctxpopup.c
index 0812098bbd..5dffe28155 100644
--- a/legacy/elementary/src/lib/elc_ctxpopup.c
+++ b/legacy/elementary/src/lib/elc_ctxpopup.c
@@ -103,18 +103,16 @@ _elc_ctxpopup_elm_widget_event(Eo *obj, Elc_Ctxpopup_Data *sd, Evas_Object *src,
    if (type != EVAS_CALLBACK_KEY_DOWN) return EINA_FALSE;
    if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) return EINA_FALSE;
 
-   if (!strcmp(ev->key, "Tab"))
-     {
-        if (evas_key_modifier_is_set(ev->modifiers, "Shift"))
-          elm_widget_focus_cycle(sd->box, ELM_FOCUS_PREVIOUS);
-        else
-          elm_widget_focus_cycle(sd->box, ELM_FOCUS_NEXT);
-        return EINA_TRUE;
-     }
-
    if (sd->box)
      {
-        if ((!strcmp(ev->key, "Left")) ||
+        if (!strcmp(ev->key, "Tab"))
+          {
+             if (evas_key_modifier_is_set(ev->modifiers, "Shift"))
+               elm_widget_focus_cycle(sd->box, ELM_FOCUS_PREVIOUS);
+             else
+               elm_widget_focus_cycle(sd->box, ELM_FOCUS_NEXT);
+          }
+        else if ((!strcmp(ev->key, "Left")) ||
             ((!strcmp(ev->key, "KP_Left")) && (!ev->string)))
           elm_widget_focus_cycle(sd->box, ELM_FOCUS_LEFT);
         else if ((!strcmp(ev->key, "Right")) ||