diff --git a/ChangeLog b/ChangeLog
index 8c00f7849..79d868f86 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2011-04-19  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	Take into account the decorations the computing menu entry width.
+
+	* grub-core/gfxmenu/widget-box.c (get_border_width): New function.
+	(grub_gfxmenu_create_box): Register get_border_width.
+	* grub-core/gfxmenu/gui_list.c (draw_menu): Use get_border_width
+	if available.
+	* include/grub/gfxwidgets.h (grub_gfxmenu_box): New member
+	get_border_width.
+
 2011-04-18  Endres Puschner <code@e7p.de>
 
 	* grub-core/gfxmenu/icon_manager.c (grub_gfxmenu_icon_manager_get_icon):
diff --git a/grub-core/gfxmenu/gui_list.c b/grub-core/gfxmenu/gui_list.c
index b6b07dfd6..e5d6fc2a1 100644
--- a/grub-core/gfxmenu/gui_list.c
+++ b/grub-core/gfxmenu/gui_list.c
@@ -248,8 +248,10 @@ draw_menu (list_impl_t self, int num_shown_items)
 
       if (is_selected)
         {
-          selbox->set_content_size (selbox, oviewport.width - 2 * boxpad - 2,
-				    item_height - 1);
+	  int cwidth = oviewport.width - 2 * boxpad - 2;
+	  if (selbox->get_border_width)
+	    cwidth -= selbox->get_border_width (selbox);
+	  selbox->set_content_size (selbox, cwidth, item_height - 1);
           selbox->draw (selbox, 0,
                         item_top - sel_toppad);
         }
diff --git a/grub-core/gfxmenu/widget-box.c b/grub-core/gfxmenu/widget-box.c
index 244fe1e6c..41ca7f536 100644
--- a/grub-core/gfxmenu/widget-box.c
+++ b/grub-core/gfxmenu/widget-box.c
@@ -178,6 +178,13 @@ set_content_size (grub_gfxmenu_box_t self,
     return;
 }
 
+static int
+get_border_width (grub_gfxmenu_box_t self)
+{
+  return (get_width (self->raw_pixmaps[BOX_PIXMAP_E])
+	  + get_width (self->raw_pixmaps[BOX_PIXMAP_W]));
+}
+
 static int
 get_left_pad (grub_gfxmenu_box_t self)
 {
@@ -288,6 +295,8 @@ grub_gfxmenu_create_box (const char *pixmaps_prefix,
 
   box->draw = draw;
   box->set_content_size = set_content_size;
+  box->get_border_width = get_border_width;
+
   box->get_left_pad = get_left_pad;
   box->get_top_pad = get_top_pad;
   box->get_right_pad = get_right_pad;
diff --git a/include/grub/gfxwidgets.h b/include/grub/gfxwidgets.h
index f9678bf9e..8ce666c5c 100644
--- a/include/grub/gfxwidgets.h
+++ b/include/grub/gfxwidgets.h
@@ -36,6 +36,7 @@ struct grub_gfxmenu_box
   void (*draw) (grub_gfxmenu_box_t self, int x, int y);
   void (*set_content_size) (grub_gfxmenu_box_t self,
                             int width, int height);
+  int (*get_border_width) (grub_gfxmenu_box_t self);
   int (*get_left_pad) (grub_gfxmenu_box_t self);
   int (*get_top_pad) (grub_gfxmenu_box_t self);
   int (*get_right_pad) (grub_gfxmenu_box_t self);