diff --git a/src/lib/edc_editor.c b/src/lib/edc_editor.c
index db8f9c4..e0445e6 100644
--- a/src/lib/edc_editor.c
+++ b/src/lib/edc_editor.c
@@ -1504,8 +1504,6 @@ edit_init(Enventor_Object *enventor, Enventor_Item *it)
 
    //Layout
    Evas_Object *layout = elm_layout_add(enventor);
-   elm_layout_content_set(enventor, "main", layout);
-
    elm_layout_file_set(layout, EDJE_PATH, "edit_layout");
    evas_object_size_hint_weight_set(layout, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
    evas_object_size_hint_align_set(layout, EVAS_HINT_FILL, EVAS_HINT_FILL);
diff --git a/src/lib/enventor_smart.c b/src/lib/enventor_smart.c
index 0fd1628..b4e5c9b 100644
--- a/src/lib/enventor_smart.c
+++ b/src/lib/enventor_smart.c
@@ -762,6 +762,7 @@ enventor_object_add(Eo *parent)
         return NULL;
      }
 
+   //TODO: These could be remove when removing enventor object library support
    Eo *obj = elm_layout_add(parent);
    elm_layout_file_set(obj, EDJE_PATH, "enventor_object");
    evas_object_event_callback_add(obj, EVAS_CALLBACK_DEL, _enventor_object_del_cb, pd);
@@ -932,8 +933,10 @@ enventor_item_represent(Enventor_Item *it)
    edit_font_scale_set(it->ed, pd->font_scale);
    edit_disabled_set(it->ed, pd->disabled);
 
-   if (evas_object_visible_get(it->pd->obj))
-     evas_object_show(edit_obj_get(it->ed));
+   //TODO: Thise could be remove when removing enventor object library support
+   Eo *obj = elm_layout_content_unset(it->pd->obj, "main");
+   evas_object_hide(obj);
+   elm_layout_content_set(it->pd->obj, "main", edit_obj_get(it->ed));
 
    autocomp_target_set(it->ed);