diff --git a/after/plugin/dap/nvim-dap-ui.lua b/after/plugin/dap/nvim-dap-ui.lua
index b97da07..f876754 100644
--- a/after/plugin/dap/nvim-dap-ui.lua
+++ b/after/plugin/dap/nvim-dap-ui.lua
@@ -5,8 +5,12 @@ dap.listeners.after.event_initialized["dapui_config"] = function()
   dapui.open()
 end
 dap.listeners.before.event_terminated["dapui_config"] = function()
-  dapui.close()
+    -- We do not close on this event, but only when we press F4
+    --dapui.close()
 end
 dap.listeners.before.event_exited["dapui_config"] = function()
   dapui.close()
 end
+
+vim.keymap.set('n', '<F4>', function() dapui.close() end)
+vim.keymap.set('n', '<M-k>', function() dapui.eval() end)