diff --git a/src/ChangeLog b/src/ChangeLog
index 520261857df..0d61ef48154 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2013-12-10  Dmitry Antipov  <dmantipov@yandex.ru>
+
+	* xdisp.c (display_tool_bar_line): Don't extend on a previously
+	drawn tool bar items (Bug#16058).
+
 2013-12-09  Ken Brown  <kbrown@cornell.edu>
 
 	* frame.c (get_frame_param): Make extern if HAVE_NTGUI.
diff --git a/src/xdisp.c b/src/xdisp.c
index 530eae3cb9e..6daa9131154 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -11937,7 +11937,9 @@ display_tool_bar_line (struct it *it, int height)
   int max_x = it->last_visible_x;
   struct glyph *last;
 
-  prepare_desired_row (row);
+  /* Don't extend on a previously drawn tool bar items (Bug#16058).  */
+  clear_glyph_row (row);
+  row->enabled_p = 1;
   row->y = it->current_y;
 
   /* Note that this isn't made use of if the face hasn't a box,