diff --git a/home/.config/nvim/ftplugin/java.lua b/home/.config/nvim/ftplugin/java.lua
index aa133fb1..698e54e2 100644
--- a/home/.config/nvim/ftplugin/java.lua
+++ b/home/.config/nvim/ftplugin/java.lua
@@ -23,6 +23,22 @@ require("jdtls").start_or_attach({
     "-data",
     workspace_dir,
   },
+  settings = { java = { signatureHelp = { enabled = true } } },
+  completion = { favoriteStaticMembers = { "java.text.MessageFormat.format" } },
+  runtimes = {
+    {
+      name = "JavaSE-1.8",
+      path = "/usr/lib/jvm/java-8-openjdk-amd64/",
+    },
+    {
+      name = "JavaSE-11",
+      path = "/usr/lib/jvm/java-11-openjdk-amd64/",
+    },
+    {
+      name = "JavaSE-19",
+      path = "/usr/lib/jvm/java-19-openjdk-amd64/",
+    },
+  },
 })
 
 require("plugins.mason").map_keys()
diff --git a/home/.config/nvim/lua/plugins/init.lua b/home/.config/nvim/lua/plugins/init.lua
index 479e6a03..96484bc7 100644
--- a/home/.config/nvim/lua/plugins/init.lua
+++ b/home/.config/nvim/lua/plugins/init.lua
@@ -99,7 +99,14 @@ local plugins = {
   { "mfussenegger/nvim-dap", config = require("plugins.dap") },
 
   -- Display function signature
-  "ray-x/lsp_signature.nvim",
+  {
+    "ray-x/lsp_signature.nvim",
+    event = "VeryLazy",
+    opts = { always_trigger = true },
+    config = function(_, opts)
+      require("lsp_signature").setup(opts)
+    end,
+  },
 
   -- Snippets plugin
   {
diff --git a/home/.config/nvim/lua/plugins/mason.lua b/home/.config/nvim/lua/plugins/mason.lua
index 0249773e..feded49a 100644
--- a/home/.config/nvim/lua/plugins/mason.lua
+++ b/home/.config/nvim/lua/plugins/mason.lua
@@ -57,8 +57,7 @@ function m.setup()
 end
 
 function m.map_keys()
-  local wk = require("which-key")
-  wk.register({
+  require("which-key").register({
     g = {
       name = "Go to",
       d = { vim.lsp.buf.definition, "Definition" },
@@ -79,6 +78,7 @@ function m.map_keys()
           "List folders",
         },
       },
+      k = { vim.lsp.buf.signature_help, "Signature help" },
       D = { vim.lsp.buf.type_definition, "Type definition" },
       rn = { vim.lsp.buf.rename, "Rename symbol" },
       ca = { vim.lsp.buf.code_action, "Code action" },