diff --git a/lua/config/autocommands.lua b/lua/config/autocommands.lua
index 14fec4c..0e788d3 100644
--- a/lua/config/autocommands.lua
+++ b/lua/config/autocommands.lua
@@ -112,17 +112,6 @@ vim.api.nvim_create_autocmd('TextYankPost', {
     end,
 })
 
--- Autosave
-vim.api.nvim_create_user_command('ToggleAutoWrite', function()
-    local value = not vim.o.autowrite
-    vim.o.autowrite = value
-    vim.o.autowriteall = value
-
-    vim.notify('autowrite: ' .. (value and 'enabled' or 'disabled'), vim.log.levels.INFO)
-end, {
-    desc = 'Toogle Autowrite',
-})
-
 vim.api.nvim_create_autocmd('FocusGained', {
     group = aug,
     callback = function()
diff --git a/lua/config/keymaps.lua b/lua/config/keymaps.lua
index 1651cfe..f6820b8 100644
--- a/lua/config/keymaps.lua
+++ b/lua/config/keymaps.lua
@@ -94,10 +94,19 @@ end
 u.map('n', ']e', diagnostic_goto(true, 'ERROR'), { desc = 'Next Error' })
 u.map('n', '[e', diagnostic_goto(false, 'ERROR'), { desc = 'Prev Error' })
 
+-- Autosave
+u.command('ToggleAutoWrite', function()
+    local value = not vim.o.autowrite
+    vim.o.autowrite = value
+    vim.o.autowriteall = value
+
+    vim.notify('autowrite: ' .. (value and 'enabled' or 'disabled'), vim.log.levels.INFO)
+end, {
+    desc = 'Toogle Autowrite',
+})
+
 -- autosave
-vim.keymap.set('n', '<leader>as', function()
-    u.toggle_autowrite()
-end, { desc = 'Toggle Autowrite' })
+vim.keymap.set('n', '<leader>as', ':ToggleAutoWrite<CR>', { desc = 'ToggleAutowrite' })
 
 -- undotree
 u.map('n', '<leader>U', u.undotree)