diff --git a/docs/changelog.rst b/docs/changelog.rst
index 72ce14549..e6de68bcc 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -26,6 +26,9 @@ To update |kitty|, :doc:`follow the instructions <binary>`.
   an English locale does not exist, set :envvar:`LANG` to ``en_US.UTF-8``
   (:iss:`3899`)
 
+- terminfo: Fix "cnorm" the property for setting the cursor to normal using a
+  solid block rather than a blinking block cursor (:iss:`3906`)
+
 
 0.22.2 [2021-08-02]
 ----------------------
diff --git a/kitty/terminfo.py b/kitty/terminfo.py
index c99f78ce5..115ccf060 100644
--- a/kitty/terminfo.py
+++ b/kitty/terminfo.py
@@ -113,7 +113,7 @@ string_capabilities = {
     # Clear screen
     'clear': r'\E[H\E[2J',
     # Make cursor appear normal
-    'cnorm': r'\E[?12l\E[?25h',
+    'cnorm': r'\E[1 q\E[?25h',
     # Carriage return
     'cr': r'^M',  # CR (carriage return \r)
     # Change scroll region
diff --git a/terminfo/kitty.terminfo b/terminfo/kitty.terminfo
index b754c2ff3..18580cf15 100644
--- a/terminfo/kitty.terminfo
+++ b/terminfo/kitty.terminfo
@@ -24,7 +24,7 @@ xterm-kitty|KovIdTTY,
 	cbt=\E[Z,
 	civis=\E[?25l,
 	clear=\E[H\E[2J,
-	cnorm=\E[?12l\E[?25h,
+	cnorm=\E[1 q\E[?25h,
 	cr=^M,
 	csr=\E[%i%p1%d;%p2%dr,
 	cub=\E[%p1%dD,
diff --git a/terminfo/x/xterm-kitty b/terminfo/x/xterm-kitty
index 57891eced..a4e0cb2d9 100644
Binary files a/terminfo/x/xterm-kitty and b/terminfo/x/xterm-kitty differ