diff --git a/lua/go/codelens.lua b/lua/go/codelens.lua
index 77adcdcf7..fd5005ae2 100644
--- a/lua/go/codelens.lua
+++ b/lua/go/codelens.lua
@@ -56,7 +56,7 @@ function M.refresh()
     return
   end
   if _GO_NVIM_CFG.lsp_codelens == true then
-    vim.lsp.codelens.enable(true, { bufnr = 0 })
+    vim.lsp.codelens.refresh({ bufnr = 0 })
   else
     log('refresh codelens')
     vim.lsp.codelens.clear(gopls.id, 0)
diff --git a/lua/go/commands.lua b/lua/go/commands.lua
index 1bd062d0b..e97f3ef0b 100644
--- a/lua/go/commands.lua
+++ b/lua/go/commands.lua
@@ -521,6 +521,11 @@ return {
     create_cmd('GoListImports', function(_)
       local lines = require('go.gopls').list_imports().PackageImports or {}
 
+      if #lines == 0 then
+        vim.notify('GoListImports: no imports found', vim.log.levels.INFO)
+        return
+      end
+
       local close_events = { 'CursorMoved', 'CursorMovedI', 'BufHidden', 'InsertCharPre' }
       local config = {
         close_events = close_events,