diff --git a/nvim/.config/nvim/lua/plugins/completion.lua b/nvim/.config/nvim/lua/plugins/completion.lua
index cb5a3fc..a97c9bb 100644
--- a/nvim/.config/nvim/lua/plugins/completion.lua
+++ b/nvim/.config/nvim/lua/plugins/completion.lua
@@ -135,12 +135,12 @@ return {
 						}), -- disable selection in cmd mode
 					}),
 					["<Tab>"] = cmp.mapping(function(fallback)
-						if cmp.visible() then
-							cmp.select_next_item()
-						-- You could replace the expand_or_jumpable() calls with expand_or_locally_jumpable()
-						-- they way you will only jump inside the snippet region
-						elseif luasnip.expand_or_jumpable() then
+						-- expand_or_jumpable() will always jump
+						-- expand_or_locally_jumpable() only jumps when still inside snippet region
+						if luasnip.expand_or_locally_jumpable() then
 							luasnip.expand_or_jump()
+						elseif cmp.visible() then
+							cmp.select_next_item()
 						elseif has_words_before() then
 							cmp.complete()
 						else
@@ -148,10 +148,10 @@ return {
 						end
 					end, { "i", "s" }),
 					["<S-Tab>"] = cmp.mapping(function(fallback)
-						if cmp.visible() then
-							cmp.select_prev_item()
-						elseif luasnip.jumpable(-1) then
+						if luasnip.jumpable(-1) then
 							luasnip.jump(-1)
+						elseif cmp.visible() then
+							cmp.select_prev_item()
 						else
 							fallback()
 						end