diff --git a/lua/plex/config/keymaps.lua b/lua/plex/config/keymaps.lua
index 887b208..c218c88 100644
--- a/lua/plex/config/keymaps.lua
+++ b/lua/plex/config/keymaps.lua
@@ -120,8 +120,10 @@ map('n', 'o', 'o', { desc = 'Insert newline below' })
 map('i', '<S-Return>', '<C-o>o', { desc = 'Start Newline' })
 
 -- Split and join lines
-map('n', '<leader>jj', ':join<CR>', { desc = 'Join lines', silent = true })
+map('n', '<leader>jj', ':join<CR>g$', { desc = 'Join lines', silent = true })
+map('n', '<leader>jJ', 'k:join<CR>j', { desc = 'Join lines', silent = true })
 map('n', '<leader>ss', 'i<CR><ESC>', { desc = 'Split lines', silent = true })
+map('n', '<leader>sS', 'i<CR><ESC>k', { desc = 'Split lines', silent = true })
 
 -- Re-select blocks after indenting in visual/select mode
 map('x', '<', '<gv', { desc = 'Indent Right and Re-select' })