diff --git a/kitty/keys.h b/kitty/keys.h
index 73ec3adb2..1198f6dc7 100644
--- a/kitty/keys.h
+++ b/kitty/keys.h
@@ -569,9 +569,9 @@ key_lookup(uint8_t key, KeyboardMode mode, uint8_t mods, uint8_t action) {
                   case 57: // LEFT
                     return "\x06\x1b\x5b\x31\x3b\x32\x44";
                   case 58: // DOWN
-                    return "\x03\x1b\x5b\x42";
+                    return "\x06\x1b\x5b\x31\x3b\x32\x42";
                   case 59: // UP
-                    return "\x03\x1b\x5b\x41";
+                    return "\x06\x1b\x5b\x31\x3b\x32\x41";
                   case 60: // PAGE_UP
                     return "\x04\x1b\x5b\x35\x7e";
                   case 61: // PAGE_DOWN
@@ -1767,9 +1767,9 @@ key_lookup(uint8_t key, KeyboardMode mode, uint8_t mods, uint8_t action) {
                   case 57: // LEFT
                     return "\x06\x1b\x5b\x31\x3b\x32\x44";
                   case 58: // DOWN
-                    return "\x03\x1b\x5b\x42";
+                    return "\x06\x1b\x5b\x31\x3b\x32\x42";
                   case 59: // UP
-                    return "\x03\x1b\x5b\x41";
+                    return "\x06\x1b\x5b\x31\x3b\x32\x41";
                   case 60: // PAGE_UP
                     return "\x04\x1b\x5b\x35\x7e";
                   case 61: // PAGE_DOWN
@@ -2973,9 +2973,9 @@ key_lookup(uint8_t key, KeyboardMode mode, uint8_t mods, uint8_t action) {
                     case 57: // LEFT
                       return "\x06\x1b\x5b\x31\x3b\x32\x44";
                     case 58: // DOWN
-                      return "\x03\x1b\x4f\x42";
+                      return "\x06\x1b\x5b\x31\x3b\x32\x42";
                     case 59: // UP
-                      return "\x03\x1b\x4f\x41";
+                      return "\x06\x1b\x5b\x31\x3b\x32\x41";
                     case 60: // PAGE_UP
                       return "\x04\x1b\x5b\x35\x7e";
                     case 61: // PAGE_DOWN
@@ -4171,9 +4171,9 @@ key_lookup(uint8_t key, KeyboardMode mode, uint8_t mods, uint8_t action) {
                     case 57: // LEFT
                       return "\x06\x1b\x5b\x31\x3b\x32\x44";
                     case 58: // DOWN
-                      return "\x03\x1b\x4f\x42";
+                      return "\x06\x1b\x5b\x31\x3b\x32\x42";
                     case 59: // UP
-                      return "\x03\x1b\x4f\x41";
+                      return "\x06\x1b\x5b\x31\x3b\x32\x41";
                     case 60: // PAGE_UP
                       return "\x04\x1b\x5b\x35\x7e";
                     case 61: // PAGE_DOWN
diff --git a/kitty/keys.py b/kitty/keys.py
index 4d9756cb5..01cad4e36 100644
--- a/kitty/keys.py
+++ b/kitty/keys.py
@@ -79,6 +79,8 @@ SHIFTED_KEYS = {
     defines.GLFW_KEY_END: key_as_bytes('kEND'),
     defines.GLFW_KEY_LEFT: key_as_bytes('kLFT'),
     defines.GLFW_KEY_RIGHT: key_as_bytes('kRIT'),
+    defines.GLFW_KEY_UP: key_as_bytes('kri'),
+    defines.GLFW_KEY_DOWN: key_as_bytes('kind'),
 }
 
 control_codes.update({
diff --git a/kitty/terminfo.py b/kitty/terminfo.py
index d3a6c7d0e..ec8cb1961 100644
--- a/kitty/terminfo.py
+++ b/kitty/terminfo.py
@@ -190,6 +190,8 @@ string_capabilities = {
     'kpp': r'\E[5~',
     # Scroll backwards (reverse index)
     'kri': r'\E[1;2A',
+    # scroll forwards (index)
+    'kind': r'\E[1;2B',
     # Restore cursor
     'rc': r'\E8',
     # Reverse video
@@ -276,8 +278,6 @@ string_capabilities = {
     # 'is2': r'\E[!p\E[?3;4l\E[4l\E>',
     # # Enter/send key
     # 'kent': r'\EOM',
-    # # scroll forwards
-    # 'kind': r'\E[1;2B',
     # # reset2
     # 'rs2': r'\E[!p\E[?3;4l\E[4l\E>',
 }
@@ -350,6 +350,7 @@ termcap_aliases.update({
     'kN': 'knp',
     'kP': 'kpp',
     'kR': 'kri',
+    'kF': 'kind',
     'rc': 'rc',
     'mr': 'rev',
     'sr': 'ri',
@@ -400,7 +401,6 @@ termcap_aliases.update({
     # 'mk': 'invis',
     # 'is': 'is2',
     # '@8': 'kent',
-    # 'kF': 'kind',
     # 'r2': 'rs2',
 })
 
diff --git a/terminfo/78/xterm-kitty b/terminfo/78/xterm-kitty
index 615403479..75c3f2bba 100644
Binary files a/terminfo/78/xterm-kitty and b/terminfo/78/xterm-kitty differ
diff --git a/terminfo/kitty.terminfo b/terminfo/kitty.terminfo
index fe86e0ed5..b761ada23 100644
--- a/terminfo/kitty.terminfo
+++ b/terminfo/kitty.terminfo
@@ -85,6 +85,7 @@ xterm-kitty|KovIdTTY,
 	khlp=,
 	khome=\EOH,
 	kich1=\E[2~,
+	kind=\E[1;2B,
 	kmous=\E[M,
 	knp=\E[6~,
 	kpp=\E[5~,
diff --git a/terminfo/x/xterm-kitty b/terminfo/x/xterm-kitty
index 615403479..75c3f2bba 100644
Binary files a/terminfo/x/xterm-kitty and b/terminfo/x/xterm-kitty differ