diff --git a/src/bin/editor/edi_editor.c b/src/bin/editor/edi_editor.c
index 462c4d1..b9caa2a 100644
--- a/src/bin/editor/edi_editor.c
+++ b/src/bin/editor/edi_editor.c
@@ -62,7 +62,7 @@ _edi_editor_file_change_ignore_cb(void *data, Evas_Object *obj EINA_UNUSED, void
 static void
 _edi_editor_file_change_popup(Evas_Object *parent, Edi_Editor *editor)
 {
-   Evas_Object *table, *box, *label, *sep, *icon, *button;
+   Evas_Object *table, *frame, *box, *label, *sep, *icon, *button;
 
    if (editor->popup)
      return;
@@ -83,6 +83,10 @@ _edi_editor_file_change_popup(Evas_Object *parent, Edi_Editor *editor)
    evas_object_show(icon);
    elm_table_pack(table, icon, 0, 0, 1, 1);
 
+   frame = elm_frame_add(editor->popup);
+   elm_object_content_set(frame, table);
+   evas_object_show(frame);
+
    box = elm_box_add(editor->popup);
    label = elm_label_add(editor->popup);
    elm_object_text_set(label, _("File contents have changed. Would you like to reload <br> the contents of this file?"));
@@ -96,7 +100,7 @@ _edi_editor_file_change_popup(Evas_Object *parent, Edi_Editor *editor)
    evas_object_show(box);
    elm_table_pack(table, box, 1, 0, 1, 1);
 
-   elm_object_content_set(editor->popup, table);
+   elm_object_content_set(editor->popup, frame);
    evas_object_show(table);
 
    button = elm_button_add(editor->popup);
diff --git a/src/bin/screens/edi_screens.c b/src/bin/screens/edi_screens.c
index 66d067d..7e3dbcb 100644
--- a/src/bin/screens/edi_screens.c
+++ b/src/bin/screens/edi_screens.c
@@ -34,7 +34,7 @@ _edi_screens_message_confirm_cb(void *data, Evas_Object *obj,
 
 void edi_screens_message_confirm(Evas_Object *parent, const char *message, void ((*confirm_cb)(void *)), void *data)
 {
-   Evas_Object *popup, *table, *label, *button, *icon, *box, *sep;
+   Evas_Object *popup, *frame, *table, *label, *button, *icon, *box, *sep;
 
    _edi_screens_popup = popup = elm_popup_add(parent);
    elm_object_part_text_set(popup, "title,text", _("Confirmation required"));
@@ -57,17 +57,16 @@ void edi_screens_message_confirm(Evas_Object *parent, const char *message, void
    evas_object_show(table);
 
    box = elm_box_add(popup);
-   sep = elm_separator_add(box);
-   elm_separator_horizontal_set(sep, EINA_TRUE);
-   evas_object_show(sep);
-   elm_box_pack_end(box, sep);
    elm_box_pack_end(box, table);
    sep = elm_separator_add(box);
    elm_separator_horizontal_set(sep, EINA_TRUE);
    evas_object_show(sep);
    elm_box_pack_end(box, sep);
 
-   elm_object_content_set(popup, box);
+   frame = elm_frame_add(popup);
+   evas_object_show(frame);
+   elm_object_content_set(frame, box);
+   elm_object_content_set(popup, frame);
 
    button = elm_button_add(popup);
    elm_object_text_set(button, _("Yes"));