diff --git a/kitty/cli.py b/kitty/cli.py
index ff4a37726..39e98ad1e 100644
--- a/kitty/cli.py
+++ b/kitty/cli.py
@@ -149,7 +149,7 @@ def kbd(x: str) -> str:
 
 @role
 def env(x: str) -> str:
-    return italic(x)
+    return ref_hyperlink(x, 'envvar-')
 
 
 role_map['envvar'] = role_map['env']
diff --git a/kitty/conf/types.py b/kitty/conf/types.py
index ad74c0f8f..31fb480c1 100644
--- a/kitty/conf/types.py
+++ b/kitty/conf/types.py
@@ -70,8 +70,8 @@ def resolve_ref(ref: str, website_url: Callable[[str], str] = website_url) -> st
     elif ref.startswith('action-'):
         frag = ref.partition('-')[-1].replace('_', '-')
         href = f'actions/#{frag}'
-    elif ref.startswith('term-'):
-        href = 'glossary/#term-' + ref.partition('-')[-1]
+    elif ref.startswith('term-') or ref.startswith('envvar-'):
+        href = 'glossary/#' + ref
     return website_url(href)