diff --git a/POPUP.md b/POPUP.md
index c56df43d..a667658d 100644
--- a/POPUP.md
+++ b/POPUP.md
@@ -10,6 +10,7 @@ stablization and any required features are merged into Neovim, we can upstream
 this and expose the API in vimL to create better compatibility.
 
 ## Notices
+- **2024-09-19:** change `enter` default to false to follow Vim.
 - **2021-09-19:** we now follow Vim's convention of the first line/column of the screen being indexed 1, so that 0 can be used for centering.
 - **2021-08-19:** we now follow Vim's default to `noautocmd` on popup creation. This can be overriden with `vim_options.noautocmd=false`
 
@@ -34,19 +35,26 @@ Unlikely (due to technical difficulties):
     - textprop
     - textpropwin
     - textpropid
-- [ ] "close"
-    - But this is mostly because I don't know how to use mouse APIs in nvim. If someone knows. please make an issue in the repo, and maybe we can get it sorted out.
 
 Unlikely (due to not sure if people are using):
 - [ ] tabpage
 
 ## Progress
 
+Suported Functions:
+
+- [x] popup.create
+- [x] popup.move
+- [ ] popup.close
+- [ ] popup.clear
+
+
 Suported Features:
 
 - [x] what
     - string
     - list of strings
+    - bufnr
 - [x] popup_create-arguments
     - [x] border
     - [x] borderchars
@@ -69,6 +77,25 @@ Suported Features:
     - [x] title
     - [x] wrap
     - [x] zindex
+    - [x] callback
+    - [ ] mousemoved
+        - [ ] "any"
+        - [ ] "word"
+        - [ ] "WORD"
+        - [ ] "expr"
+        - [ ] (list options)
+    - [?] close
+        - [ ] "button"
+        - [ ] "click"
+        - [x] "none"
+
+
+Additional Features:
+
+- [x] enter
+- [x] focusable
+- [x] noautocmd
+- [x] finalize_callback
 
 ## All known unimplemented vim features at the moment
 
@@ -79,10 +106,7 @@ Suported Features:
 - filter
 - filtermode
 - mapping
-- callback
 - mouse:
-    - mousemoved
-    - close
     - drag
     - resize
 
diff --git a/lua/plenary/popup/init.lua b/lua/plenary/popup/init.lua
index 1c50c065..6adb360b 100644
--- a/lua/plenary/popup/init.lua
+++ b/lua/plenary/popup/init.lua
@@ -26,6 +26,12 @@ popup._hidden = {}
 -- Keep track of popup borders, so we don't have to pass them between functions
 popup._borders = {}
 
+-- Callbacks to be called later by popup.execute_callback. Indexed by win_id.
+popup._callback_fn = {}
+
+-- Result is passed to the callback. Indexed by win_id. See popup_win_closed.
+popup._result = {}
+
 local function dict_default(options, key, default)
   if options[key] == nil then
     return default[key]
@@ -34,9 +40,6 @@ local function dict_default(options, key, default)
   end
 end
 
--- Callbacks to be called later by popup.execute_callback
-popup._callbacks = {}
-
 -- Convert the positional {vim_options} to compatible neovim options and add them to {win_opts}
 -- If an option is not given in {vim_options}, fall back to {default_opts}
 local function add_position_config(win_opts, vim_options, default_opts)
@@ -112,6 +115,69 @@ local function add_position_config(win_opts, vim_options, default_opts)
   -- ,     contents on the screen.  Set to TRUE to disable this.
 end
 
+--- Closes the popup window
+--- Adapted from vim.lsp.util.close_preview_autocmd
+---
+---@param winnr integer window id of popup window
+---@param bufnrs table|nil optional list of ignored buffers
+local function close_window(winnr, bufnrs)
+  vim.schedule(function()
+    -- exit if we are in one of ignored buffers
+    if bufnrs and vim.list_contains(bufnrs, vim.api.nvim_get_current_buf()) then
+      return
+    end
+
+    local augroup = 'popup_window_' .. winnr
+    pcall(vim.api.nvim_del_augroup_by_name, augroup)
+    pcall(vim.api.nvim_win_close, winnr, true)
+  end)
+end
+
+--- Creates autocommands to close a popup window when events happen.
+---
+---@param events table list of events
+---@param winnr integer window id of popup window
+---@param bufnrs table list of buffers where the popup window will remain visible, {popup, parent}
+---@see autocmd-events
+local function close_window_autocmd(events, winnr, bufnrs)
+  local augroup = vim.api.nvim_create_augroup('popup_window_' .. winnr, {
+    clear = true,
+  })
+
+  -- close the popup window when entered a buffer that is not
+  -- the floating window buffer or the buffer that spawned it
+  vim.api.nvim_create_autocmd('BufEnter', {
+    group = augroup,
+    callback = function()
+      close_window(winnr, bufnrs)
+    end,
+  })
+
+  if #events > 0 then
+    vim.api.nvim_create_autocmd(events, {
+      group = augroup,
+      buffer = bufnrs[2],
+      callback = function()
+        close_window(winnr)
+      end,
+    })
+  end
+end
+--- End of code adapted from vim.lsp.util.close_preview_autocmd
+
+--- Only used from 'WinClosed' autocommand
+--- Cleanup after popup window closes.
+---@param win_id integer window id of popup window
+local function popup_win_closed(win_id)
+  -- Invoke the callback with the win_id and result.
+  if popup._callback_fn[win_id] then
+    pcall(popup._callback_fn[win_id], win_id, popup._result[win_id])
+    popup._callback_fn[win_id] = nil
+  end
+  -- Forget about this window.
+  popup._result[win_id] = nil
+end
+
 function popup.create(what, vim_options)
   vim_options = vim.deepcopy(vim_options)
 
@@ -236,19 +302,36 @@ function popup.create(what, vim_options)
 
   local win_id
   if vim_options.hidden then
-    assert(false, "I have not implemented this yet and don't know how")
+    assert(false, "hidden: not implemented yet and don't know how")
   else
     win_id = vim.api.nvim_open_win(bufnr, false, win_opts)
   end
 
+  -- Set the default result. Also serves to indicate active popups.
+  popup._result[win_id] = -1
+  -- Always catch the popup's close
+  local augroup = vim.api.nvim_create_augroup('popup_close_' .. win_id, {
+    clear = true,
+  })
+  vim.api.nvim_create_autocmd('WinClosed', {
+    group = augroup,
+    pattern = tostring(win_id),
+    callback = function()
+      pcall(vim.api.nvim_del_augroup_by_name, augroup)
+      popup_win_closed(win_id)
+    end,
+  })
+
   -- Moved, handled after since we need the window ID
   if vim_options.moved then
     if vim_options.moved == "any" then
-      vim.lsp.util.close_preview_autocmd({ "CursorMoved", "CursorMovedI" }, win_id)
-      -- elseif vim_options.moved == "word" then
-      --   TODO: Handle word, WORD, expr, and the range functions... which seem hard?
+      close_window_autocmd({ "CursorMoved", "CursorMovedI" }, win_id, {bufnr, vim.fn.bufnr()})
+    -- else
+    --   --   TODO: Handle word, WORD, expr, and the range functions... which seem hard?
+    --   assert(false, "moved ~= 'any': not implemented yet and don't know how")
     end
   else
+    -- TODO: If the buffer's deleted close the window. Is this needed?
     local silent = false
     vim.cmd(
       string.format(
@@ -397,7 +480,7 @@ function popup.create(what, vim_options)
   -- enter
   local should_enter = vim_options.enter
   if should_enter == nil then
-    should_enter = true
+    should_enter = false
   end
 
   if should_enter then
@@ -412,22 +495,10 @@ function popup.create(what, vim_options)
 
   -- callback
   if vim_options.callback then
-    popup._callbacks[bufnr] = function()
-      -- (jbyuki): Giving win_id is pointless here because it's closed right afterwards
-      -- but it might make more sense once hidden is implemented
-      local row, _ = unpack(vim.api.nvim_win_get_cursor(win_id))
-      vim_options.callback(win_id, what[row])
-      vim.api.nvim_win_close(win_id, true)
-    end
-    vim.api.nvim_buf_set_keymap(
-      bufnr,
-      "n",
-      "<CR>",
-      '<cmd>lua require"plenary.popup".execute_callback(' .. bufnr .. ")<CR>",
-      { noremap = true }
-    )
+    popup._callback_fn[win_id] = vim_options.callback
   end
 
+  -- TODO: Wonder what this is about? Debug? Convenience to get bufnr?
   if vim_options.finalize_callback then
     vim_options.finalize_callback(win_id, bufnr)
   end
@@ -478,12 +549,5 @@ function popup.move(win_id, vim_options)
   end
 end
 
-function popup.execute_callback(bufnr)
-  if popup._callbacks[bufnr] then
-    local wrapper = popup._callbacks[bufnr]
-    wrapper()
-    popup._callbacks[bufnr] = nil
-  end
-end
-
 return popup
+-- vim:sw=2 ts=2 et
diff --git a/lua/plenary/popup/utils.lua b/lua/plenary/popup/utils.lua
index e665e150..54dd6829 100644
--- a/lua/plenary/popup/utils.lua
+++ b/lua/plenary/popup/utils.lua
@@ -14,6 +14,9 @@ utils.bounded = function(value, min, max)
   return value
 end
 
+-- TODO:    Should defaults get deepcopy before table values are used?
+--          utils.apply_defaults is never used AFAICT.
+--          So I guess this comment is about plenary/tbl.lua.
 utils.apply_defaults = function(original, defaults)
   if original == nil then
     original = {}
diff --git a/tests/plenary/popup_spec.lua b/tests/plenary/popup_spec.lua
index 250ba0e4..a83ea7aa 100644
--- a/tests/plenary/popup_spec.lua
+++ b/tests/plenary/popup_spec.lua
@@ -130,6 +130,131 @@ describe("plenary.popup", function()
     })
   end)
 
+  describe("callback option", function()
+    local callback_result
+    local function callback(wid, result)
+      callback_result = result
+    end
+
+    it("without a callback", function()
+      callback_result = nil
+      local popup_wid = popup.create("hello there", {
+      })
+      vim.api.nvim_win_close(popup_wid, true)
+
+      eq(nil, callback_result)
+    end)
+
+    it("with a callback", function()
+      callback_result = nil
+      local popup_wid = popup.create("hello there", {
+        callback = callback,
+      })
+      vim.api.nvim_win_close(popup_wid, true)
+
+      eq(-1, callback_result)
+    end)
+  end)
+
+  describe("enter option", function()
+    it("enter not specified", function()
+      local main_wid = vim.fn.win_getid()
+      -- same as enter = false
+      local popup_wid = popup.create("hello there", {
+      })
+      cur_wid = vim.fn.win_getid()
+      -- current window should still be the main window
+      eq(main_wid, cur_wid)
+      vim.api.nvim_win_close(popup_wid, true)
+    end)
+
+    it("enter = false", function()
+      local main_wid = vim.fn.win_getid()
+      local popup_wid = popup.create("hello there", {
+        enter = false,
+      })
+      cur_wid = vim.fn.win_getid()
+      -- current window should still be the main window
+      eq(main_wid, cur_wid)
+      vim.api.nvim_win_close(popup_wid, true)
+    end)
+
+    it("enter = true", function()
+      local main_wid = vim.fn.win_getid()
+      local popup_wid = popup.create("hello there", {
+        enter = true,
+      })
+      cur_wid = vim.fn.win_getid()
+      -- current window should be the popup
+      eq(popup_wid, cur_wid)
+      vim.api.nvim_win_close(popup_wid, true)
+    end)
+  end)
+
+  describe("moved option", function()
+    local function populate()
+      local wnr = vim.fn.winnr()
+      local bnr = vim.fn.winbufnr(wnr)
+      vim.fn.setbufline(bnr, 1, {"one", "two", "three", "four"})
+      vim.fn.cursor(1, 1)
+    end
+    local callback_result
+    local function callback(wid, result)
+      callback_result = result
+    end
+
+    it("with moved but not used", function()
+      callback_result = nil
+      populate()
+      local popup_wid = popup.create("hello there", {
+        moved = "any",
+        callback = callback,
+      })
+      vim.api.nvim_win_close(popup_wid, true)
+      eq(-1, callback_result)
+    end)
+
+  --[[
+    it("with moved but not used", function()
+      async()
+      callback_result = nil
+      populate()
+      local popup_wid = popup.create("hello there", {
+        callback = callback,
+      })
+      -- move the cursor, should not do callback
+      vim.fn.cursor(2, 1)
+      local timer = vim.uv.new_timer()
+      timer:start(10, 0, function()
+        eq(nil, callback_result)
+        vim.api.nvim_win_close(popup_wid, true)
+        done()
+      end)
+    end)
+
+    it("with moved", function()
+      async()
+      callback_result = nil
+      populate()
+      local popup_wid = popup.create("hello there", {
+        moved = "any",
+        callback = callback,
+      })
+      -- move the cursor, window closes and callback invoked
+      vim.fn.cursor(2, 1)
+      local timer = vim.uv.new_timer()
+      timer:start(10, 0, function()
+        eq(-1, callback_result)
+        if -1 ~= callback_result then
+          -- window wasn't closed
+          vim.api.nvim_win_close(popup_wid, true)
+        end
+        done()
+      end)
+    end)
+  ]]
+  end)
+
   describe("what", function()
     it("can be an existing bufnr", function()
       local bufnr = vim.api.nvim_create_buf(false, false)
@@ -160,3 +285,4 @@ describe("plenary.popup", function()
     end)
   end)
 end)
+-- vim:sw=2 ts=2 et