diff --git a/src/e_mod_main.c b/src/e_mod_main.c
index cb2666e..192f5a1 100644
--- a/src/e_mod_main.c
+++ b/src/e_mod_main.c
@@ -514,7 +514,6 @@ _places_cb_mouse_down(void *data, Evas *evas, Evas_Object *obj, void *event)
 {
    Instance *inst = NULL;
    Evas_Event_Mouse_Down *ev;
-   E_Zone *zone = NULL;
    E_Menu_Item *mi = NULL;
    int x, y;
 
@@ -524,9 +523,6 @@ _places_cb_mouse_down(void *data, Evas *evas, Evas_Object *obj, void *event)
      {
         E_Menu *m;
 
-        /* grab current zone */
-        zone = e_zone_current_get();
-
         /* create popup menu */
         m = e_menu_new();
 
@@ -544,7 +540,8 @@ _places_cb_mouse_down(void *data, Evas *evas, Evas_Object *obj, void *event)
                                           NULL, NULL);
 
         /* show the menu relative to gadgets position */
-        e_menu_activate_mouse(m, zone, (x + ev->output.x),
+        e_menu_activate_mouse(m, e_zone_current_get(),
+                              (x + ev->output.x),
                               (y + ev->output.y), 1, 1,
                               E_MENU_POP_DIRECTION_AUTO, ev->timestamp);
         evas_event_feed_mouse_up(inst->gcc->gadcon->evas, ev->button,
diff --git a/src/e_mod_places.c b/src/e_mod_places.c
index f783e05..b22935a 100644
--- a/src/e_mod_places.c
+++ b/src/e_mod_places.c
@@ -500,10 +500,9 @@ places_run_fm(const char *directory)
    else
      {
         E_Action *act = e_action_find("fileman");
-        Eina_List *managers = e_manager_list();
 
-        if (act && act->func.go && managers && managers->data)
-          act->func.go(E_OBJECT(managers->data), directory);
+        if (act && act->func.go)
+          act->func.go(E_OBJECT(e_comp), directory);
         else
           e_util_dialog_internal(D_("Warning"),
                       D_("<b>Cannot run the Enlightenment FileManager.</b><br>"