diff --git a/.config/kak/autoload/lsp.kak b/.config/kak/autoload/lsp.kak
index e8b010f3..4649cfe8 100644
--- a/.config/kak/autoload/lsp.kak
+++ b/.config/kak/autoload/lsp.kak
@@ -49,9 +49,9 @@ define-command -hidden inlay-toggle %{
 }
 
 declare-option -hidden bool inlay_diagnostics_enabled false
-define-command -hidden inlay_diagnostics-on %{
+define-command -hidden inlay-diagnostics-on %{
     lsp-inlay-diagnostics-enable window
-    set-option window inlay-diagnostics_enabled true
+    set-option window inlay_diagnostics_enabled true
 }
 define-command -hidden inlay-diagnostics-off %{
     lsp-inlay-diagnostics-disable window
@@ -70,7 +70,7 @@ define-command -hidden inlay-diagnostics-toggle %{
 declare-option -hidden bool inline_diagnostics_enabled true
 define-command -hidden inline-diagnostics-on %{
     lsp-inline-diagnostics-enable window
-    set-option window inline-diagnostics_enabled true
+    set-option window inline_diagnostics_enabled true
 }
 define-command -hidden inline-diagnostics-off %{
     lsp-inline-diagnostics-disable window
@@ -95,14 +95,10 @@ define-command -hidden lsp-filetype-hooks-update %{
     	# commands to execute for lsp window settings
 		lsp-enable-window
 		inlay-on
-		try %{
-    		# only map to UI mode if that module is available
-    		map -docstring 'toggle inlay hints' window ui h ': inlay-toggle<ret>'
-    		map -docstring 'toggle inlay diagnostics' window ui d ': diagnostics-toggle<ret>'
-		} catch %{
-    		map -docstring 'toggle inlay hints' window lsp <a-h> ': inlay-toggle<ret>'
-    		map -docstring 'toggle inlay diagnostics' window lsp <a-d> ': diagnostics-toggle<ret>'
-		}
+		# only map to UI mode if that module is available
+		map -docstring 'toggle inlay hints' window ui h ': inlay-toggle<ret>'
+		map -docstring 'toggle inlay diagnostics' window ui d ': inlay-diagnostics-toggle<ret>'
+		map -docstring 'toggle inline diagnostics' window ui e ': inline-diagnostics-toggle<ret>'
 	}
 }
 lsp-filetype-hooks-update