diff --git a/lua/nami/remap.lua b/lua/nami/remap.lua
index b9172ab..4e76376 100644
--- a/lua/nami/remap.lua
+++ b/lua/nami/remap.lua
@@ -111,7 +111,7 @@ vim.keymap.set("v", "<space>l", ":lua<CR>")                 -- source the visual
 -- return
 -- Turns into this:
 -- return // retuns
-vim.keymap.set("n", "L", "0d$jA pk\"_dd$")
+vim.keymap.set("n", "L", "I <Esc>0dwd$jA <Esc>pk\"_dd$")
 -- Does the same on a selection of lines
 -- This:
 -- // returns
@@ -120,7 +120,7 @@ vim.keymap.set("n", "L", "0d$jA pk\"_dd$")
 -- Turns into this:
 -- return // returns
 --        // something
-vim.keymap.set("v", "L", ":m '>+1<CR>gv=gv:lua SelectionStart()<CR>gv=gvo0o$<C-v>d\"_ddkA <Esc>p0")
+vim.keymap.set("v", "L", ":m '>+1<CR>gv=gv:norm I <Esc>0dwgvV:lua SelectionStart()<CR>gv=gvo0o$<C-v>d\"_ddkA <Esc>p0")
 -- How it works:
 -- :m '>+1<CR>gv=gv:lua SelectionStart()<CR>gv=gvo0o$<C-v>d\"_ddkA <Esc>p0
 -- ^