Index: elementary/src/lib/elc_multibuttonentry.c
===================================================================
--- elementary/src/lib/elc_multibuttonentry.c	(revision 69574)
+++ elementary/src/lib/elc_multibuttonentry.c	(working copy)
@@ -342,6 +342,9 @@ _set_vis_guidetext(Evas_Object *obj)
    elm_box_unpack(wd->box, wd->guidetext);
    elm_box_unpack(wd->box, wd->entry);
    if (wd->view_state == MULTIBUTTONENTRY_VIEW_SHRINK) return;
+   
+   if(!wd->focused)
+     elm_object_focus_set(wd->entry, EINA_FALSE);
 
    if (wd && (!eina_list_count(wd->items)) && wd->guidetext
        && (!elm_widget_focus_get(obj)) && (!wd->focused) && (!wd->n_str))
@@ -782,7 +785,7 @@ static void
 _resize_button(Evas_Object *btn, Evas_Coord *realw, Evas_Coord *vieww)
 {
    Evas_Coord rw, vw;
-   Evas_Coord w_text, h_btn, padding_outer, padding_inner = 0;
+   Evas_Coord w_text, h_btn, padding_outer = 0;
    Evas_Coord w_btn = 0, button_max_width = 0;
    const char *size_str;
 
@@ -793,7 +796,7 @@ _resize_button(Evas_Object *btn, Evas_Coord *realw
    edje_object_part_geometry_get(btn, "elm.base", NULL, NULL, NULL, &h_btn);
    edje_object_part_geometry_get(btn, "elm.btn.text", NULL, NULL, &w_text, NULL);
    edje_object_part_geometry_get(btn, "right.padding", NULL, NULL, &padding_outer, NULL);
-   w_btn = w_text + 2*padding_outer + 2*padding_inner;
+   w_btn = w_text + 2*padding_outer;
 
    rw = w_btn;