diff --git a/laptop/config/keymaps.lua b/laptop/config/keymaps.lua
index 4aa0d31..f6ff961 100644
--- a/laptop/config/keymaps.lua
+++ b/laptop/config/keymaps.lua
@@ -23,14 +23,14 @@ map({ 'v', 'n' }, '<leader>d', '"_d', { remap = false })
 map('n', '<leader>D', '"_D', { remap = false })
 map('n', '<leader>x', '"_x', { remap = false })
 
--- Insert a newline in normal mode by ,o
-map('n', '<leader>o', "o<Esc>k", { remap = false })
-map('n', '<leader>O', "O<Esc>j", { remap = false })
+-- Insert a newline in normal mode by ,o and ,O
+map('n', '<leader>o', ":call append(line('.'), '')<cr>", { remap = false })
+map('n', '<leader>O', ":call append(line('.')-1, '')<cr>", { remap = false })
 
 -- Use ,u for redo
 map('n', '<leader>u', "<c-r>", { remap = false })
 
--- Buffer related keymaps
+-- Browser like keymaps
 map('n', '<leader>k', ":bnext<cr>", { remap = false })
 map('n', '<leader>j', ":bprevious<cr>", { remap = false })
 map('n', '<leader>w', ":bdelete<cr>", { remap = false })
diff --git a/server/config/keymaps.lua b/server/config/keymaps.lua
index 4d02c06..bdcd1bc 100644
--- a/server/config/keymaps.lua
+++ b/server/config/keymaps.lua
@@ -13,17 +13,16 @@ map('n', '<leader>D', '"_D', { remap = false })
 map('n', '<leader>x', '"_x', { remap = false })
 
 -- Insert a newline in normal mode by ,o
-map('n', '<leader>o', "o<Esc>k", { remap = false })
-map('n', '<leader>O', "O<Esc>j", { remap = false })
+map('n', '<leader>o', ":call append(line('.'), '')<cr>", { remap = false })
+map('n', '<leader>O', ":call append(line('.')-1, '')<cr>", { remap = false })
 
 -- Use ,u for redo
 map('n', '<leader>u', "<c-r>", { remap = false })
 
-
 -- Find files using fzf by ,f
 map('n', '<leader>f', ":Files<cr>", { remap = false })
 
--- Buffer related keymaps
+-- Browser like keymaps
 map('n', '<leader>k', ":bnext<cr>", { remap = false })
 map('n', '<leader>j', ":bprevious<cr>", { remap = false })
 map('n', '<leader>w', ":bdelete<cr>", { remap = false })
diff --git a/vps/config/keymaps.lua b/vps/config/keymaps.lua
index 2acb820..52b4d11 100644
--- a/vps/config/keymaps.lua
+++ b/vps/config/keymaps.lua
@@ -12,8 +12,8 @@ map('n', '<leader>D', '"_D', { remap = false })
 map('n', '<leader>x', '"_x', { remap = false })
 
 -- Insert a newline in normal mode by ,o
-map('n', '<leader>o', "o<Esc>k", { remap = false })
-map('n', '<leader>O', "O<Esc>j", { remap = false })
+map('n', '<leader>o', ":call append(line('.'), '')<cr>", { remap = false })
+map('n', '<leader>O', ":call append(line('.')-1, '')<cr>", { remap = false })
 
 -- Use ,u for redo
 map('n', '<leader>u', "<c-r>", { remap = false })
@@ -21,7 +21,7 @@ map('n', '<leader>u', "<c-r>", { remap = false })
 -- Find files using fzf by ,f
 map('n', '<leader>f', ":Files<cr>", { remap = false })
 
--- Buffer related keymaps
+-- Browser like keymaps
 map('n', '<leader>k', ":bnext<cr>", { remap = false })
 map('n', '<leader>j', ":bprevious<cr>", { remap = false })
 map('n', '<leader>w', ":bdelete<cr>", { remap = false })