diff --git a/lua/plugins/configs/others.lua b/lua/plugins/configs/others.lua
index 7d06c76..d967f26 100644
--- a/lua/plugins/configs/others.lua
+++ b/lua/plugins/configs/others.lua
@@ -41,9 +41,10 @@ end
 
 M.better_escape = function()
    local m = require("core.utils").load_config().mappings.plugin.better_escape.esc_insertmode
-
-   vim.g.better_escape_interval = config.options.plugin.esc_insertmode_timeout or 300
-   vim.g.better_escape_shortcut = m
+   require("better_escape").setup {
+      mapping = m,
+      timeout = config.options.plugin.esc_insertmode_timeout or 300,
+   }
 end
 
 M.blankline = function()
diff --git a/lua/plugins/init.lua b/lua/plugins/init.lua
index 4a67097..01456ce 100644
--- a/lua/plugins/init.lua
+++ b/lua/plugins/init.lua
@@ -163,10 +163,10 @@ return packer.startup(function()
    }
 
    use {
-      "jdhao/better-escape.vim",
+      "max397574/better-escape.nvim",
       disable = not plugin_status.esc_insertmode,
       event = "InsertEnter",
-      setup = function()
+      config = function()
          require("plugins.configs.others").better_escape()
       end,
    }