diff --git a/src/components/popover/tab/keypress/scancodes.json b/src/components/popover/tab/keypress/scancodes.json
index da395873..526fc6a1 100644
--- a/src/components/popover/tab/keypress/scancodes.json
+++ b/src/components/popover/tab/keypress/scancodes.json
@@ -280,6 +280,54 @@
             {
                 "id": "69",
                 "text": "F12"
+            },
+            {
+                "id": "104",
+                "text": "F13"
+            },
+            {
+                "id": "105",
+                "text": "F14"
+            },
+            {
+                "id": "106",
+                "text": "F15"
+            },
+            {
+                "id": "107",
+                "text": "F16"
+            },
+            {
+                "id": "108",
+                "text": "F17"
+            },
+            {
+                "id": "109",
+                "text": "F18"
+            },
+            {
+                "id": "110",
+                "text": "F19"
+            },
+            {
+                "id": "111",
+                "text": "F20"
+            },
+            {
+                "id": "112",
+                "text": "F21"
+            },
+            {
+                "id": "113",
+                "text": "F22"
+            },
+            {
+                "id": "114",
+                "text": "F23"
+            },
+            {
+                "id": "115",
+                "text": "F24"
             }
         ]
     },
@@ -539,4 +587,4 @@
             }
         ]
     }
-]
+]
\ No newline at end of file
diff --git a/src/services/mapper.service.ts b/src/services/mapper.service.ts
index 314aa59b..611db1ab 100644
--- a/src/services/mapper.service.ts
+++ b/src/services/mapper.service.ts
@@ -117,6 +117,18 @@ export class MapperService {
         this.scanCodeTextMap.set(81, ['Down Arrow']);
         this.scanCodeTextMap.set(82, ['Up Arrow']);
         this.scanCodeTextMap.set(83, ['Num Lock']);
+        this.scanCodeTextMap.set(104, ['F13']);
+        this.scanCodeTextMap.set(105, ['F14']);
+        this.scanCodeTextMap.set(106, ['F15']);
+        this.scanCodeTextMap.set(107, ['F16']);
+        this.scanCodeTextMap.set(108, ['F17']);
+        this.scanCodeTextMap.set(109, ['F18']);
+        this.scanCodeTextMap.set(110, ['F19']);
+        this.scanCodeTextMap.set(111, ['F20']);
+        this.scanCodeTextMap.set(112, ['F21']);
+        this.scanCodeTextMap.set(113, ['F22']);
+        this.scanCodeTextMap.set(114, ['F23']);
+        this.scanCodeTextMap.set(115, ['F24']);
         this.scanCodeTextMap.set(118, ['Menu']);
         this.scanCodeTextMap.set(232, ['Play']);
         this.scanCodeTextMap.set(233, ['Stop']);