diff --git a/src/common/keyboard.ts b/src/common/keyboard.ts
index c1ac86d..a708084 100644
--- a/src/common/keyboard.ts
+++ b/src/common/keyboard.ts
@@ -50,8 +50,7 @@ export const VK_KEY_B = 'KeyB';
 export const VK_KEY_N = 'KeyN';
 export const VK_KEY_M = 'KeyM';
 
-// [F1-F12]
-// MISSING CODES: [F13-F24]
+// [F1-F24]
 export const VK_F1 = 'F1';
 export const VK_F2 = 'F2';
 export const VK_F3 = 'F3';
@@ -64,6 +63,18 @@ export const VK_F9 = 'F9';
 export const VK_F10 = 'F10';
 export const VK_F11 = 'F11';
 export const VK_F12 = 'F12';
+export const VK_F13 = 'F13';
+export const VK_F14 = 'F14';
+export const VK_F15 = 'F15';
+export const VK_F16 = 'F16';
+export const VK_F17 = 'F17';
+export const VK_F18 = 'F18';
+export const VK_F19 = 'F19';
+export const VK_F20 = 'F20';
+export const VK_F21 = 'F21';
+export const VK_F22 = 'F22';
+export const VK_F23 = 'F23';
+export const VK_F24 = 'F24';
 export const VK_BACKQUOTE = 'Backquote';
 export const VK_MINUS = 'Minus';
 export const VK_EQUAL = 'Equal';
diff --git a/src/common/node/robot/win32.ts b/src/common/node/robot/win32.ts
index c8cbfd9..c11fb95 100644
--- a/src/common/node/robot/win32.ts
+++ b/src/common/node/robot/win32.ts
@@ -30,6 +30,18 @@ export abstract class WindowsRobot extends BreachProtocolRobot {
     [k.VK_F10, 0x79],
     [k.VK_F11, 0x7a],
     [k.VK_F12, 0x7b],
+    [k.VK_F13, 0x7c],
+    [k.VK_F14, 0x7d],
+    [k.VK_F15, 0x7e],
+    [k.VK_F16, 0x7f],
+    [k.VK_F17, 0x80],
+    [k.VK_F18, 0x81],
+    [k.VK_F19, 0x82],
+    [k.VK_F20, 0x83],
+    [k.VK_F21, 0x84],
+    [k.VK_F22, 0x85],
+    [k.VK_F23, 0x86],
+    [k.VK_F24, 0x87],
     [k.VK_BACKQUOTE, 0xc0],
     [k.VK_MINUS, 0xbd],
     [k.VK_EQUAL, 0xbb],
diff --git a/src/common/node/robot/xdotool.ts b/src/common/node/robot/xdotool.ts
index 8773ba3..86d0efb 100644
--- a/src/common/node/robot/xdotool.ts
+++ b/src/common/node/robot/xdotool.ts
@@ -38,6 +38,18 @@ export class XDoToolRobot extends BreachProtocolRobot {
     [k.VK_F10, 0xffc7],
     [k.VK_F11, 0xffc8],
     [k.VK_F12, 0xffc9],
+    [k.VK_F13, 0xffca],
+    [k.VK_F14, 0xffcb],
+    [k.VK_F15, 0xffcc],
+    [k.VK_F16, 0xffcd],
+    [k.VK_F17, 0xffce],
+    [k.VK_F18, 0xffcf],
+    [k.VK_F19, 0xffd0],
+    [k.VK_F20, 0xffd1],
+    [k.VK_F21, 0xffd2],
+    [k.VK_F22, 0xffd3],
+    [k.VK_F23, 0xffd4],
+    [k.VK_F24, 0xffd5],
     [k.VK_BACKQUOTE, 0x0060],
     [k.VK_MINUS, 0x002d],
     [k.VK_EQUAL, 0x003d],
diff --git a/src/electron/renderer/components/AcceleratorKeyBind.tsx b/src/electron/renderer/components/AcceleratorKeyBind.tsx
index 645ed34..9dac2fd 100644
--- a/src/electron/renderer/components/AcceleratorKeyBind.tsx
+++ b/src/electron/renderer/components/AcceleratorKeyBind.tsx
@@ -57,6 +57,18 @@ const keys: [string, string][] = [
   [k.VK_F10, 'F10'],
   [k.VK_F11, 'F11'],
   [k.VK_F12, 'F12'],
+  [k.VK_F13, 'F13'],
+  [k.VK_F14, 'F14'],
+  [k.VK_F15, 'F15'],
+  [k.VK_F16, 'F16'],
+  [k.VK_F17, 'F17'],
+  [k.VK_F18, 'F18'],
+  [k.VK_F19, 'F19'],
+  [k.VK_F20, 'F20'],
+  [k.VK_F21, 'F21'],
+  [k.VK_F22, 'F22'],
+  [k.VK_F23, 'F23'],
+  [k.VK_F24, 'F24'],
   [k.VK_BACKQUOTE, '`'],
   [k.VK_MINUS, '-'],
   [k.VK_EQUAL, '='],