diff --git a/nvim/.config/nvim/lua/lsp/gopls.lua b/nvim/.config/nvim/lua/lsp/gopls.lua
index 93efe33..b19629f 100644
--- a/nvim/.config/nvim/lua/lsp/gopls.lua
+++ b/nvim/.config/nvim/lua/lsp/gopls.lua
@@ -17,15 +17,16 @@ end
 
 function format_with_imports(timeout_ms)
     OrgImports(1000)
-    vim.lsp.buf.formatting()
+    vim.lsp.buf.format()
 end
 
-vim.cmd [[
-    augroup gopls
-        autocmd!
-        autocmd BufWritePre *.go lua format_with_imports(1000, "utf-16")
-    augroup END
-]]
+vim.api.nvim_create_autocmd('BufWritePre', {
+  pattern = '*.go',
+  callback = function()
+    vim.lsp.buf.code_action({ context = { only = { 'source.organizeImports' } }, apply = true })
+    vim.lsp.buf.format()
+  end
+})
 
 require('lspconfig').gopls.setup {
     capabilities = common.cap,