diff --git a/experimental/ecdb/trunk/data/themes/default/groups/entry.edc b/experimental/ecdb/trunk/data/themes/default/groups/entry.edc
index 2c77e726..6f957d07 100644
--- a/experimental/ecdb/trunk/data/themes/default/groups/entry.edc
+++ b/experimental/ecdb/trunk/data/themes/default/groups/entry.edc
@@ -92,8 +92,8 @@ group {
       program {
          name: "focus1";
          action: FOCUS_SET;
-         signal: "load";
-         source: "";
+         signal: "mouse,down,*";
+         source: "*";
          target: "label";
       }
 
@@ -148,7 +148,7 @@ group {
             min: 1 1;
             rel1 {
                relative: 0.0 0.0;
-               offset: 1 3;
+               offset: 0 3;
             }
 
             rel2 {
diff --git a/experimental/ecdb/trunk/src/ecdb_gui.c b/experimental/ecdb/trunk/src/ecdb_gui.c
index a480f9ec..9c94cdb8 100644
--- a/experimental/ecdb/trunk/src/ecdb_gui.c
+++ b/experimental/ecdb/trunk/src/ecdb_gui.c
@@ -550,7 +550,10 @@ ecdb_cb_burn_image_page_buttons_clicked(void *data, Evas_Object *o,
    }
    else if (!strcmp(source, "ecdb/burn_image/file"))
    {
-      evas_object_focus_set(o, 1);
+      // o is not the entry, it is the burn_image_page!
+      swallow = evas_object_name_find(ecore_evas_get(em->main_win_ee),
+                                                      "ecdb/burn_image/file");
+      evas_object_focus_set(swallow, 1);
    }
 
 }