diff --git a/kitty/cli.py b/kitty/cli.py
index e68e22d4d..e80bdd21e 100644
--- a/kitty/cli.py
+++ b/kitty/cli.py
@@ -178,6 +178,15 @@ def ref(x: str) -> str:
     return t
 
 
+@role
+def ac(x: str) -> str:
+    t, q = text_and_target(x)
+    url = resolve_ref(q)
+    if url:
+        return hyperlink_for_url(url, t)
+    return t
+
+
 OptionSpecSeq = List[Union[str, OptionDict]]
 
 
diff --git a/kitty/conf/types.py b/kitty/conf/types.py
index 9d98e90bc..b3fcdb49d 100644
--- a/kitty/conf/types.py
+++ b/kitty/conf/types.py
@@ -65,7 +65,7 @@ def resolve_ref(ref: str, website_url: Callable[[str], str] = website_url) -> st
     elif ref.startswith('action-group-'):
         href = f'{website_url("generated/actions")}#{ref}'
     elif ref.startswith('action-'):
-        frag = ref.partition('-')[-1]
+        frag = ref.partition('-')[-1].replace('_', '-')
         href = f'{website_url("generated/actions")}#{frag}'
     return href