diff --git a/ChangeLog b/ChangeLog
index cdeee7c2b..dbf6f23eb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-05-23  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* gfxmenu/view.c (grub_gfxmenu_draw_terminal_box): Apply only to current
+	buffer since gfxterm handles double repaint.
+
 2010-05-23  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* gfxmenu/gfxmenu.c (grub_gfxmenu_try): Change viewport on both buffers.
diff --git a/gfxmenu/view.c b/gfxmenu/view.c
index 9a5671cdd..518c3ba53 100644
--- a/gfxmenu/view.c
+++ b/gfxmenu/view.c
@@ -357,11 +357,6 @@ grub_gfxmenu_draw_terminal_box (void)
   term_box->draw (term_box,
 		  term_rect.x - term_box->get_left_pad (term_box),
 		  term_rect.y - term_box->get_top_pad (term_box));
-  grub_video_swap_buffers ();
-  if (term_view->double_repaint)
-    term_box->draw (term_box,
-		    term_rect.x - term_box->get_left_pad (term_box),
-		    term_rect.y - term_box->get_top_pad (term_box));
 }
 
 static void