diff --git a/init.lua b/init.lua
index 52eabd5..c1f0a1b 100644
--- a/init.lua
+++ b/init.lua
@@ -15,4 +15,7 @@ require('lsp.go-ls')
 -- Completion
 require('nv-compe')
 
+-- Function signatures
+require('lsp_signature')
+
 require('nv-prettier')
diff --git a/lua/lsp/go-ls.lua b/lua/lsp/go-ls.lua
index f4a9daf..c250209 100644
--- a/lua/lsp/go-ls.lua
+++ b/lua/lsp/go-ls.lua
@@ -1,5 +1,17 @@
 lspconfig = require "lspconfig"
 lspconfig.gopls.setup {
+  on_attach = function(client, bufnr)
+    require "lsp_signature".on_attach({
+        bind = false,
+        -- floating_window = true,
+        --hint_enable = true,
+        fix_pos = true,
+        use_lspsaga = true,
+        --handler_opts = {
+        --  border = "single"   -- double, single, shadow, none
+        --},
+      })
+  end,
   cmd = {"gopls", "serve"},
   settings = {
     gopls = {
@@ -44,3 +56,5 @@ function goimports(timeout_ms)
 end
 
 vim.cmd("autocmd BufWritePre *.go lua goimports(1000)")
+local saga = require 'lspsaga'
+saga.init_lsp_saga()