diff --git a/init.lua b/init.lua
index 2215ac78..71a5fd74 100644
--- a/init.lua
+++ b/init.lua
@@ -86,6 +86,7 @@ vim.o.termguicolors = true
 -- NOTE: you can add any custom options in the `lua/custom/options.lua`
 -- file to avoid any conflict with this file if you're interested in keeping
 -- up-to-date with whatever is in the kickstart repo.
+pcall(require, 'custom/options')
 
 -- Install package manager
 --    https://github.com/folke/lazy.nvim
@@ -247,6 +248,7 @@ vim.keymap.set('n', 'j', "v:count == 0 ? 'gj' : 'j'", { expr = true, silent = tr
 -- NOTE: you can add any custom keybinding in the `lua/custom/map.lua`
 -- file to avoid any conflict with this file if you're interested in keeping
 -- up-to-date with whatever is in the kickstart repo.
+pcall(require, 'custom/map')
 
 -- [[ Highlight on yank ]]
 -- See `:help vim.highlight.on_yank()`
@@ -507,6 +509,4 @@ cmp.setup {
 -- NOTE: you can add any additional custom `vim` config in the `lua/custom/after.lua`
 -- file to avoid any conflict with this file if you're interested in keeping
 -- up-to-date with whatever is in the kickstart repo.
-pcall(require, 'custom/options')
-pcall(require, 'custom/map')
 pcall(require, 'custom/after')