diff --git a/nvim/.config/nvim/lua/opdavies/init.lua b/nvim/.config/nvim/lua/opdavies/init.lua
index 4eb0e03..4a0f55c 100644
--- a/nvim/.config/nvim/lua/opdavies/init.lua
+++ b/nvim/.config/nvim/lua/opdavies/init.lua
@@ -58,7 +58,8 @@ map('v', '<left>', '<nop>', options)
 map('v', '<right>', '<nop>', options)
 map('v', '<up>', '<nop>', options)
 
-map('n', '<Leader>k', ':nohlsearch', options)
+-- Clears hlsearch after doing a search, otherwise just does normal <CR> stuff
+vim.cmd[[ nnoremap <expr> <CR> {-> v:hlsearch ? ":nohl\<CR>" : "\<CR>"}() ]]
 
 require('packer').startup(function()
   use 'wbthomason/packer.nvim'