diff --git a/src/modules/everything/evry.c b/src/modules/everything/evry.c
index 76d6b34a6..953ed2c76 100644
--- a/src/modules/everything/evry.c
+++ b/src/modules/everything/evry.c
@@ -1260,6 +1260,8 @@ _evry_cb_key_down(void *data __UNUSED__, int type __UNUSED__, void *event)
 	else if (_evry_view_key_press(s, ev))
 	  goto end;
      }
+   else if (_evry_view_key_press(s, ev))
+     goto end;
    else if (!strcmp(key, "Right"))
      _evry_browse_item(selector);
    else if (!strcmp(key, "Left"))
diff --git a/src/modules/everything/evry_plug_view_list.c b/src/modules/everything/evry_plug_view_list.c
index a0e33cc31..6da239429 100644
--- a/src/modules/everything/evry_plug_view_list.c
+++ b/src/modules/everything/evry_plug_view_list.c
@@ -573,12 +573,25 @@ _cb_key_down(const Evry_View *view, const Ecore_Event_Key *ev)
      _list_plugin_next(v);
    else if (!strcmp(key, "Prior"))
      _list_plugin_prev(v);
-   else if ((!strcmp(key, "Left") && (ev->modifiers & ECORE_EVENT_MODIFIER_CTRL)))
-     _list_plugin_prev(v);
-   else if ((!strcmp(key, "Right") && (ev->modifiers & ECORE_EVENT_MODIFIER_CTRL)))
-     _list_plugin_prev(v);
+   else if (ev->modifiers & ECORE_EVENT_MODIFIER_SHIFT)
+     {
+	if (!strcmp(key, "Left"))
+	  _list_plugin_prev(v);
+	else if (!strcmp(key, "Right"))
+	  _list_plugin_next(v);
+	else return 0;
+	
+	return 1;
+     }
    else if (ev->modifiers & ECORE_EVENT_MODIFIER_CTRL)
-     _list_plugin_next_by_name(v, key);
+     {
+	if (!strcmp(key, "Left"))
+	  _list_plugin_prev(v);
+	else if (!strcmp(key, "Right"))
+	  _list_plugin_next(v);
+	else if (ev->compose)
+	  _list_plugin_next_by_name(v, key);
+     }   
    else return 0;
 
    return 1;