diff --git a/src/bin/gui.c b/src/bin/gui.c
index 322787e..22e45da 100644
--- a/src/bin/gui.c
+++ b/src/bin/gui.c
@@ -105,7 +105,7 @@ gui_widget_menu_create(Evas_Object *parent)
 {
    Evas_Object *nf = NULL, *box = NULL, *o = NULL;
 
-   nf = elm_naviframe_add(parent);
+   gd->widget_naviframe = nf = elm_naviframe_add(parent);
    evas_object_show(nf);
 
    box = o = elm_box_add(nf);
@@ -122,7 +122,6 @@ gui_widget_menu_create(Evas_Object *parent)
 
    gd->list  = o = elm_list_add(box);
    elm_list_select_mode_set(o, ELM_OBJECT_SELECT_MODE_ALWAYS);
-   evas_object_data_set(o, "nf", nf);
    EXPAND(o); FILL(o);
    elm_box_pack_end(box, o);
    evas_object_show(o);
@@ -455,9 +454,10 @@ _custom_styles_add(Evas_Object *list, Widget_Type widget)
  * called when the widget list item is selected.
  */
 static void
-_widget_list_sel_cb(void *data, Evas_Object *obj, void *event_info EINA_UNUSED)
+_widget_list_sel_cb(void *data, Evas_Object *obj EINA_UNUSED,
+                    void *event_info EINA_UNUSED)
 {
-   Evas_Object *nf = evas_object_data_get(obj, "nf");
+   Evas_Object *nf = gd->widget_naviframe;
    Evas_Object *li, *prev_btn;
    Elm_Object_Item *it;
    Eina_List *styles, *l;
diff --git a/src/bin/gui.h b/src/bin/gui.h
index c0d9d50..e9d1bb7 100644
--- a/src/bin/gui.h
+++ b/src/bin/gui.h
@@ -11,6 +11,7 @@ struct _Gui_Data
    Evas_Object *gui_layout;
    Evas_Object *preview_box;
    Evas_Object *preview_obj;
+   Evas_Object *widget_naviframe;
    Evas_Object *list;
    Evas_Object *desc_lbl;
    Evas_Object *desc_scr;