diff --git a/init.lua b/init.lua
index 184ad37..445ca57 100644
--- a/init.lua
+++ b/init.lua
@@ -22,6 +22,7 @@ cmd 'colorscheme gruvbox-material'            -- Put your favorite colorscheme h
 cmd 'syntax enable'
 cmd 'filetype plugin indent on'
 cmd 'language en_US'
+utils.opt('o', 'hlsearch', true)
 utils.opt('o', 'guifont', 'Hack NF:h9')
 utils.opt('o', 'swapfile', false)
 utils.opt('o', 'backup', false)
diff --git a/lua/autocommands.lua b/lua/autocommands.lua
index 0a65ce8..ef21744 100644
--- a/lua/autocommands.lua
+++ b/lua/autocommands.lua
@@ -23,9 +23,6 @@ local autocmds = {
     resize_windows_proportionally = {
         { 'VimResized', '*', ':wincmd =' };
     };
-    toggle_search_highlighting = {
-        { 'InsertEnter', '*', 'setlocal nohlsearch' };
-    };
     lua_highlight = {
         { 'TextYankPost', '*', [[silent! lua vim.highlight.on_yank() {higroup='IncSearch', timeout=400}]] };
     };
diff --git a/lua/keymappings.lua b/lua/keymappings.lua
index 583fdb6..8609e0d 100644
--- a/lua/keymappings.lua
+++ b/lua/keymappings.lua
@@ -53,4 +53,5 @@ utils.map('v', '<', '<gv')
 utils.map('v', '>', '>gv')
 
 -- Highlight word under cursor
-utils.map('n', 'ü', ":exec 'match Search /\\V\\<' . expand('<cword>') . '\\>/'<CR>")
+utils.map('n', 'ü', ":let @/='\\<<C-R>=expand(\"<cword>\")<CR>\\>'<CR>:set hls<CR>")
+utils.map('v', 'ü', "y:let @/='<C-R>=escape(@\",'/\\')<CR>'<CR>:set hls<CR>")