diff --git a/Resources/Locale/en-US/input.ftl b/Resources/Locale/en-US/input.ftl
index 8f5813a8a..61dbb550b 100644
--- a/Resources/Locale/en-US/input.ftl
+++ b/Resources/Locale/en-US/input.ftl
@@ -18,6 +18,15 @@ input-key-F12 = F12
 input-key-F13 = F13
 input-key-F14 = F14
 input-key-F15 = F15
+input-key-F16 = F16
+input-key-F17 = F17
+input-key-F18 = F18
+input-key-F19 = F19
+input-key-F20 = F20
+input-key-F21 = F21
+input-key-F22 = F22
+input-key-F23 = F23
+input-key-F24 = F24
 input-key-Pause = Pause
 input-key-Left = Left
 input-key-Up = Up
diff --git a/Robust.Client/Graphics/Clyde/Windowing/Glfw.Keys.cs b/Robust.Client/Graphics/Clyde/Windowing/Glfw.Keys.cs
index d705c3b7e..7d85966dc 100644
--- a/Robust.Client/Graphics/Clyde/Windowing/Glfw.Keys.cs
+++ b/Robust.Client/Graphics/Clyde/Windowing/Glfw.Keys.cs
@@ -207,6 +207,15 @@ namespace Robust.Client.Graphics.Clyde
                     {GlfwKey.F13, Key.F13},
                     {GlfwKey.F14, Key.F14},
                     {GlfwKey.F15, Key.F15},
+                    {GlfwKey.F16, Key.F16},
+                    {GlfwKey.F17, Key.F17},
+                    {GlfwKey.F18, Key.F18},
+                    {GlfwKey.F19, Key.F19},
+                    {GlfwKey.F20, Key.F20},
+                    {GlfwKey.F21, Key.F21},
+                    {GlfwKey.F22, Key.F22},
+                    {GlfwKey.F23, Key.F23},
+                    {GlfwKey.F24, Key.F24},
                     {GlfwKey.Pause, Key.Pause},
                     {GlfwKey.World1, Key.World1},
                 };
diff --git a/Robust.Client/Graphics/Clyde/Windowing/Sdl2.Keys.cs b/Robust.Client/Graphics/Clyde/Windowing/Sdl2.Keys.cs
index 995000093..102e50a3a 100644
--- a/Robust.Client/Graphics/Clyde/Windowing/Sdl2.Keys.cs
+++ b/Robust.Client/Graphics/Clyde/Windowing/Sdl2.Keys.cs
@@ -191,6 +191,15 @@ internal partial class Clyde
             MapKey(SDL_SCANCODE_F13, Key.F13);
             MapKey(SDL_SCANCODE_F14, Key.F14);
             MapKey(SDL_SCANCODE_F15, Key.F15);
+            MapKey(SDL_SCANCODE_F16, Key.F16);
+            MapKey(SDL_SCANCODE_F17, Key.F17);
+            MapKey(SDL_SCANCODE_F18, Key.F18);
+            MapKey(SDL_SCANCODE_F19, Key.F19);
+            MapKey(SDL_SCANCODE_F20, Key.F20);
+            MapKey(SDL_SCANCODE_F21, Key.F21);
+            MapKey(SDL_SCANCODE_F22, Key.F22);
+            MapKey(SDL_SCANCODE_F23, Key.F23);
+            MapKey(SDL_SCANCODE_F24, Key.F24);
             MapKey(SDL_SCANCODE_PAUSE, Key.Pause);
 
             KeyMapReverse = new Dictionary<Key, SDL_Scancode>();
diff --git a/Robust.Client/Input/InputDevices.cs b/Robust.Client/Input/InputDevices.cs
index a9c2bfb11..e25287263 100644
--- a/Robust.Client/Input/InputDevices.cs
+++ b/Robust.Client/Input/InputDevices.cs
@@ -161,6 +161,15 @@ namespace Robust.Client.Input
             F13,
             F14,
             F15,
+            F16,
+            F17,
+            F18,
+            F19,
+            F20,
+            F21,
+            F22,
+            F23,
+            F24,
             Pause,
             World1,
         }