diff --git a/source/application/StarMainApplication_sdl.cpp b/source/application/StarMainApplication_sdl.cpp
index d6cea76..c697a26 100644
--- a/source/application/StarMainApplication_sdl.cpp
+++ b/source/application/StarMainApplication_sdl.cpp
@@ -131,6 +131,15 @@ Maybe<Key> keyFromSdlKeyCode(SDL_Keycode sym) {
     {SDLK_F13, Key::F13},
     {SDLK_F14, Key::F14},
     {SDLK_F15, Key::F15},
+    {SDLK_F16, Key::F16},
+    {SDLK_F17, Key::F17},
+    {SDLK_F18, Key::F18},
+    {SDLK_F19, Key::F19},
+    {SDLK_F20, Key::F20},
+    {SDLK_F21, Key::F21},
+    {SDLK_F22, Key::F22},
+    {SDLK_F23, Key::F23},
+    {SDLK_F24, Key::F24},
     {SDLK_NUMLOCKCLEAR, Key::NumLock},
     {SDLK_CAPSLOCK, Key::CapsLock},
     {SDLK_SCROLLLOCK, Key::ScrollLock},
diff --git a/source/core/StarInputEvent.cpp b/source/core/StarInputEvent.cpp
index 7d6835b..e4b1e64 100644
--- a/source/core/StarInputEvent.cpp
+++ b/source/core/StarInputEvent.cpp
@@ -114,6 +114,15 @@ EnumMap<Key> const KeyNames{
   {Key::F13, "F13"},
   {Key::F14, "F14"},
   {Key::F15, "F15"},
+  {Key::F16, "F16"},
+  {Key::F17, "F17"},
+  {Key::F18, "F18"},
+  {Key::F19, "F19"},
+  {Key::F20, "F20"},
+  {Key::F21, "F21"},
+  {Key::F22, "F22"},
+  {Key::F23, "F23"},
+  {Key::F24, "F24"},
   {Key::NumLock, "NumLock"},
   {Key::CapsLock, "CapsLock"},
   {Key::ScrollLock, "ScrollLock"},
diff --git a/source/core/StarInputEvent.hpp b/source/core/StarInputEvent.hpp
index fefca1b..e750efa 100644
--- a/source/core/StarInputEvent.hpp
+++ b/source/core/StarInputEvent.hpp
@@ -119,6 +119,15 @@ enum class Key : uint16_t {
   F13,
   F14,
   F15,
+  F16,
+  F17,
+  F18,
+  F19,
+  F20,
+  F21,
+  F22,
+  F23,
+  F24,
   NumLock,
   CapsLock,
   ScrollLock,