diff --git a/pkgsets/emacs/lsp.nix b/pkgsets/emacs/lsp.nix
index c50ab4d..feea103 100644
--- a/pkgsets/emacs/lsp.nix
+++ b/pkgsets/emacs/lsp.nix
@@ -29,14 +29,17 @@ mkIf (elem "emacs::lsp" config.machine.pkgs) {
 
     lsp-ui = {
       enable = true;
-      after = [ "lsp" ];
-      command = [ "lsp-ui-mode" "lsp-ui-sideline-mode" ];
+      after = [ "lsp-mode" ];
       config = ''
-        (setq lsp-ui-sideline-enable t
-              lsp-ui-sideline-show-symbol nil
-              lsp-ui-sideline-show-hover nil
-              lsp-ui-sideline-show-code-actions t
-              lsp-ui-sideline-update-mode 'point)
+        (setq lsp-ui-sideline-enable 't)
+        (setq lsp-ui-sideline-show-symbol nil)
+        (setq lsp-ui-sideline-show-hover nil)
+        (setq lsp-ui-doc-show-with-cursor 't)
+        (setq lsp-ui-doc-delay 1)
+        (setq lsp-ui-sideline-show-code-actions 't)
+        (setq lsp-ui-sideline-update-mode 'point)
+        (define-key lsp-ui-mode-map [remap xref-find-definitions] #'lsp-ui-peek-find-definitions)
+        (define-key lsp-ui-mode-map [remap xref-find-references] #'lsp-ui-peek-find-references)
       '';
     };