diff --git a/lua/dapui/config/highlights.lua b/lua/dapui/config/highlights.lua
index f8b5ae1f..c7a0c787 100644
--- a/lua/dapui/config/highlights.lua
+++ b/lua/dapui/config/highlights.lua
@@ -46,6 +46,7 @@ function M.setup()
   hi default DapUIRestart guifg=#A9FF68
   hi default DapUIUnavailable guifg=#424242
   hi default DapUIWinSelect ctermfg=Cyan guifg=#00f1f5 gui=bold
+  hi default link DapUIEndofBuffer EndofBuffer
   ]])
 
   -- Generate *NC variants of the control highlight groups
diff --git a/lua/dapui/windows/layout.lua b/lua/dapui/windows/layout.lua
index 70178f1b..fa2ee5eb 100644
--- a/lua/dapui/windows/layout.lua
+++ b/lua/dapui/windows/layout.lua
@@ -184,7 +184,7 @@ function WindowLayout:_init_win_settings(win)
   for key, val in pairs(win_settings) do
     api.nvim_win_set_option(win, key, val)
   end
-  vim.fn.setwinvar(win, "&winhl", "Normal:DapUINormal,EndOfBuffer:DapUINormal")
+  vim.fn.setwinvar(win, "&winhl", "Normal:DapUINormal,EndOfBuffer:DapUIEndOfBuffer")
 end
 
 function WindowLayout:new(layout)