diff --git a/roles/neovim/files/lua/opdavies/lsp/init.lua b/roles/neovim/files/lua/opdavies/lsp/init.lua
index 6e2180a..2009b31 100644
--- a/roles/neovim/files/lua/opdavies/lsp/init.lua
+++ b/roles/neovim/files/lua/opdavies/lsp/init.lua
@@ -36,6 +36,7 @@ local custom_attach = function(client)
   -- Keymaps
   buf_inoremap { "<c-s>", vim.lsp.buf.signature_help }
 
+  buf_nnoremap { "<leader>ca", vim.lsp.buf.code_action }
   buf_nnoremap { "<leader>dn", vim.diagnostic.goto_next }
   buf_nnoremap { "<leader>dp", vim.diagnostic.goto_prev }
   buf_nnoremap { "<leader>gD", vim.lsp.buf.declaration }
@@ -50,7 +51,6 @@ local custom_attach = function(client)
     buf_nnoremap { "K", vim.lsp.buf.hover }
   end
 
-  telescope_mapper("<leader>ca", "lsp_code_actions", nil, true)
   telescope_mapper("<leader>dl", "diagnostics", nil, true)
 
   -- Set autocommands conditional on server_capabilities
diff --git a/roles/neovim/files/lua/opdavies/plugins.lua b/roles/neovim/files/lua/opdavies/plugins.lua
index 35ff263..8238411 100644
--- a/roles/neovim/files/lua/opdavies/plugins.lua
+++ b/roles/neovim/files/lua/opdavies/plugins.lua
@@ -104,6 +104,7 @@ return packer.startup(function()
   use "nvim-telescope/telescope.nvim"
   use "nvim-telescope/telescope-file-browser.nvim"
   use { "nvim-telescope/telescope-fzf-native.nvim", run = "make" }
+  use { "nvim-telescope/telescope-ui-select.nvim" }
 
   -- Git
   use 'TimUntersberger/neogit'
diff --git a/roles/neovim/files/lua/opdavies/telescope/setup.lua b/roles/neovim/files/lua/opdavies/telescope/setup.lua
index ae4a7eb..d45e00a 100644
--- a/roles/neovim/files/lua/opdavies/telescope/setup.lua
+++ b/roles/neovim/files/lua/opdavies/telescope/setup.lua
@@ -46,13 +46,19 @@ telescope.setup {
     no_ignore = true,
     prompt_prefix = "$ ",
   },
+
   extensions = {
     file_browser = {
       theme = "ivy",
     },
+
+    ["ui-select"] = {
+      require("telescope.themes").get_dropdown {},
+    },
   },
 }
 
 telescope.load_extension "file_browser"
 telescope.load_extension "fzf"
 telescope.load_extension "refactoring"
+telescope.load_extension "ui-select"