diff --git a/src/lib/edje/edje_util.c b/src/lib/edje/edje_util.c
index a8071531e1..d3476cb2c0 100644
--- a/src/lib/edje/edje_util.c
+++ b/src/lib/edje/edje_util.c
@@ -6725,7 +6725,7 @@ edje_object_part_text_set(const Edje_Object *obj, const char *part, const char *
 
    ed = _edje_fetch(obj);
 
-   return _edje_efl_text_text_set((Eo *) obj, ed, part, text, EINA_TRUE, EINA_FALSE);
+   return _edje_efl_text_text_set((Eo *) obj, ed, part, text, EINA_TRUE, EINA_TRUE);
 }
 
 EAPI const char *
diff --git a/src/tests/elementary/elm_test_entry.c b/src/tests/elementary/elm_test_entry.c
index 200ff1e744..93951d9e45 100644
--- a/src/tests/elementary/elm_test_entry.c
+++ b/src/tests/elementary/elm_test_entry.c
@@ -480,6 +480,26 @@ EFL_START_TEST(elm_entry_text_set)
 }
 EFL_END_TEST
 
+EFL_START_TEST(elm_entry_guide_text_set)
+{
+   Evas_Object *win, *entry;
+   const char *markup_text = "<font_size=32 color=#FFF>markup_test</font_size>";
+   const char *markup_text2 = "<font_size=24 color=#FFF>test_markup</font_size>";
+
+   win = win_add(NULL, "entry", ELM_WIN_BASIC);
+
+   entry = elm_entry_add(win);
+
+   elm_object_part_text_set(entry, "elm.guide", markup_text);
+   elm_entry_editable_set(entry, EINA_FALSE);
+   ck_assert_str_eq(elm_object_part_text_get(entry, "elm.guide"), markup_text);
+
+   elm_object_part_text_set(entry, "elm.guide", markup_text2);
+   elm_entry_single_line_set(entry, EINA_FALSE);
+   ck_assert_str_eq(elm_object_part_text_get(entry, "elm.guide"), markup_text2);
+}
+EFL_END_TEST
+
 EFL_START_TEST(elm_entry_file_get_set)
 {
    Evas_Object *win, *entry;
@@ -627,6 +647,7 @@ void elm_test_entry(TCase *tc)
    tcase_add_test(tc, elm_entry_atspi_text_selections);
    tcase_add_test(tc, elm_atspi_role_get);
    tcase_add_test(tc, elm_entry_text_set);
+   tcase_add_test(tc, elm_entry_guide_text_set);
    tcase_add_test(tc, elm_entry_magnifier);
    tcase_add_test(tc, elm_entry_file_get_set);
    tcase_add_test(tc, elm_entry_test_text_class);