diff --git a/ChangeLog.parse-color b/ChangeLog.parse-color
index ccba06d3c..941cd5aad 100644
--- a/ChangeLog.parse-color
+++ b/ChangeLog.parse-color
@@ -39,3 +39,9 @@
 	function.
 	(GRUB_MOD_INIT): Register background_color command.
 	(GRUB_MOD_FINI): Unregister background_color command.
+
+	Fix border repainting.
+
+	* grub-core/term/gfxterm.c (dirty_region_add): When a repaint is
+	already scheduled, merge the virtual screen with the requested
+	region rather than repainting only the virtual screen.
diff --git a/grub-core/term/gfxterm.c b/grub-core/term/gfxterm.c
index 93367f2bb..c914f8d2c 100644
--- a/grub-core/term/gfxterm.c
+++ b/grub-core/term/gfxterm.c
@@ -539,10 +539,20 @@ dirty_region_add (int x, int y, unsigned int width, unsigned int height)
 
   if (repaint_scheduled)
     {
-      x = virtual_screen.offset_x;
-      y = virtual_screen.offset_y;
-      width = virtual_screen.width;
-      height = virtual_screen.height;
+      if (x > (int)virtual_screen.offset_x)
+        {
+          width += virtual_screen.offset_x - x;
+          x = virtual_screen.offset_x;
+        }
+      if (y > (int)virtual_screen.offset_y)
+        {
+          height += virtual_screen.offset_y - y;
+          y = virtual_screen.offset_y;
+        }
+      if (width < virtual_screen.width)
+        width = virtual_screen.width;
+      if (height < virtual_screen.height)
+        height = virtual_screen.height;
       repaint_scheduled = 0;
       repaint_was_scheduled = 1;
     }