diff --git a/src/lib/elementary/elc_fileselector_entry.c b/src/lib/elementary/elc_fileselector_entry.c
index a6e7a70954..5251644c5a 100644
--- a/src/lib/elementary/elc_fileselector_entry.c
+++ b/src/lib/elementary/elc_fileselector_entry.c
@@ -241,6 +241,7 @@ _elm_fileselector_entry_efl_canvas_group_group_add(Eo *obj, Elm_Fileselector_Ent
    efl_ui_mirrored_automatic_set(priv->button, EINA_FALSE);
    efl_ui_mirrored_set(priv->button, efl_ui_mirrored_get(obj));
    elm_widget_style_set(priv->button, "fileselector_entry/default");
+   efl_composite_attach(obj, priv->button);
 
    elm_fileselector_expandable_set
      (priv->button, _elm_config->fileselector_expand_enable);
diff --git a/src/lib/elementary/elm_fileselector_entry.eo b/src/lib/elementary/elm_fileselector_entry.eo
index 3a91c6ec2f..c9fdc6e6de 100644
--- a/src/lib/elementary/elm_fileselector_entry.eo
+++ b/src/lib/elementary/elm_fileselector_entry.eo
@@ -22,4 +22,7 @@ class Elm.Fileselector_Entry extends Efl.Ui.Layout implements Elm.Interface.File
       file,chosen: void; [[Called when a file was chosen in the fileselector]]
       press: void; [[Called when entry was pressed]]
    }
+   composite {
+      Elm.Interface.Fileselector;
+   }
 }