diff --git a/lua/config/keymaps.lua b/lua/config/keymaps.lua
index e7abd5a..2a12b9c 100644
--- a/lua/config/keymaps.lua
+++ b/lua/config/keymaps.lua
@@ -9,6 +9,16 @@ vim.keymap.set('n', '<Esc>', '<cmd>nohlsearch<CR>')
 vim.keymap.set('n', '<leader>q', vim.diagnostic.setloclist, { desc = 'Open diagnostic [Q]uickfix list' })
 vim.keymap.set('n', '<leader>ld', vim.diagnostic.open_float, { desc = '[L]ine [D]iagnostic' })
 
+-- Insert --
+-- Press jk fast to exit insert mode
+vim.keymap.set('i', 'jk', '<ESC>')
+vim.keymap.set('i', 'kj', '<ESC>')
+
+-- Visual --
+-- Stay in indent mode
+vim.keymap.set('v', '<', '<gv^')
+vim.keymap.set('v', '>', '>gv^')
+
 -- Exit terminal mode in the builtin terminal with a shortcut that is a bit easier
 -- for people to discover. Otherwise, you normally need to press <C-\><C-n>, which
 -- is not what someone will guess without a bit more experience.