diff --git a/src/nvim/grid.c b/src/nvim/grid.c
index 97899181c1..7916ec55d7 100644
--- a/src/nvim/grid.c
+++ b/src/nvim/grid.c
@@ -1088,9 +1088,9 @@ static void grid_draw_bordertext(VirtText vt, int col, int winbl, const int *hl_
                                  int win_hl_attr_normal, BorderTextType bt, int overflow)
 {
   int default_attr = hl_attr[bt == kBorderTextTitle ? HLF_BTITLE : HLF_BFOOTER];
-  default_attr = hl_combine_attr(win_hl_attr_normal, default_attr);
 
   if (overflow > 0) {
+    default_attr = hl_combine_attr(win_hl_attr_normal, default_attr);
     grid_line_puts(1, "<", -1,  hl_apply_winblend(winbl, default_attr));
     col += 1;
     overflow += 1;
@@ -1122,6 +1122,7 @@ static void grid_draw_bordertext(VirtText vt, int col, int winbl, const int *hl_
       text = p;
     }
     attr = hl_apply_winblend(winbl, attr);
+    attr = hl_combine_attr(win_hl_attr_normal, attr);
     col += grid_line_puts(col, text, -1, attr);
   }
 }
diff --git a/test/functional/ui/float_spec.lua b/test/functional/ui/float_spec.lua
index 2b1fb1d733..49e204b6d7 100644
--- a/test/functional/ui/float_spec.lua
+++ b/test/functional/ui/float_spec.lua
@@ -3041,10 +3041,10 @@ describe('float window', function()
         ## grid 3
                                                   |
         ## grid 4
-          {33:╔}🦄{7:BB}{33:═════╗}|
+          {33:╔}{1:🦄}{7:BB}{33:═════╗}|
           {33:║}{1: halloj! }{33:║}|
           {33:║}{1: BORDAA  }{33:║}|
-          {33:╚}🦄{7:BB}{33:═════╝}|
+          {33:╚}{1:🦄}{7:BB}{33:═════╝}|
         ]],
           float_pos = { [4] = { 1001, 'NW', 1, 2, 5, true, 50, 1, 2, 5 } },
           win_viewport = {
@@ -3057,10 +3057,10 @@ describe('float window', function()
           grid = [[
           ^                                        |
           {0:~                                       }|
-          {0:~    }{33:╔}🦄{7:BB}{33:═════╗}{0:                        }|
+          {0:~    }{33:╔}{1:🦄}{7:BB}{33:═════╗}{0:                        }|
           {0:~    }{33:║}{1: halloj! }{33:║}{0:                        }|
           {0:~    }{33:║}{1: BORDAA  }{33:║}{0:                        }|
-          {0:~    }{33:╚}🦄{7:BB}{33:═════╝}{0:                        }|
+          {0:~    }{33:╚}{1:🦄}{7:BB}{33:═════╝}{0:                        }|
                                                   |
         ]],
         }