diff --git a/browser/components/extensions/schemas/commands.json b/browser/components/extensions/schemas/commands.json
index a1632088e35d..9dbaf43ee1b6 100644
--- a/browser/components/extensions/schemas/commands.json
+++ b/browser/components/extensions/schemas/commands.json
@@ -13,6 +13,10 @@
             "type": "string",
             "pattern": "^\\s*(Alt|Ctrl|Command|MacCtrl)\\s*\\+\\s*(Shift\\s*\\+\\s*)?([A-Z0-9]|Comma|Period|Home|End|PageUp|PageDown|Space|Insert|Delete|Up|Down|Left|Right)\\s*$"
           },
+          {
+            "type": "string",
+            "pattern": "^\\s*((Alt|Ctrl|Command|MacCtrl)\\s*\\+\\s*)?(Shift\\s*\\+\\s*)?(F[1-9]|F1[0-2])\\s*$"
+          },
           {
             "type": "string",
             "pattern": "^(MediaNextTrack|MediaPlayPause|MediaPrevTrack|MediaStop)$"
diff --git a/browser/components/extensions/test/browser/browser_ext_commands_onCommand.js b/browser/components/extensions/test/browser/browser_ext_commands_onCommand.js
index dd959dceceb8..e378d2c76787 100644
--- a/browser/components/extensions/test/browser/browser_ext_commands_onCommand.js
+++ b/browser/components/extensions/test/browser/browser_ext_commands_onCommand.js
@@ -98,6 +98,25 @@ add_task(function* test_user_defined_commands() {
         shiftKey: true,
       },
     },
+    // Function keys
+    {
+      name: "function-keys-Alt+Shift+F3",
+      shortcut: "Alt+Shift+F3",
+      key: "VK_F3",
+      modifiers: {
+        altKey: true,
+        shiftKey: true,
+      },
+    },
+    {
+      name: "function-keys-F2",
+      shortcut: "F2",
+      key: "VK_F2",
+      modifiers: {
+        altKey: false,
+        shiftKey: false,
+      },
+    },
     // Misc Shortcuts
     {
       name: "valid-command-with-unrecognized-property-name",
diff --git a/browser/components/extensions/test/xpcshell/test_ext_manifest_commands.js b/browser/components/extensions/test/xpcshell/test_ext_manifest_commands.js
index 4de7afe01ab6..cafc0b08144e 100644
--- a/browser/components/extensions/test/xpcshell/test_ext_manifest_commands.js
+++ b/browser/components/extensions/test/xpcshell/test_ext_manifest_commands.js
@@ -15,7 +15,8 @@ add_task(function* test_manifest_commands() {
 
   let expectedError = (
     String.raw`commands.toggle-feature.suggested_key.default: Value must either: ` +
-    String.raw`match the pattern /^\s*(Alt|Ctrl|Command|MacCtrl)\s*\+\s*(Shift\s*\+\s*)?([A-Z0-9]|Comma|Period|Home|End|PageUp|PageDown|Space|Insert|Delete|Up|Down|Left|Right)\s*$/, or ` +
+    String.raw`match the pattern /^\s*(Alt|Ctrl|Command|MacCtrl)\s*\+\s*(Shift\s*\+\s*)?([A-Z0-9]|Comma|Period|Home|End|PageUp|PageDown|Space|Insert|Delete|Up|Down|Left|Right)\s*$/, ` +
+    String.raw`match the pattern /^\s*((Alt|Ctrl|Command|MacCtrl)\s*\+\s*)?(Shift\s*\+\s*)?(F[1-9]|F1[0-2])\s*$/, or ` +
     String.raw`match the pattern /^(MediaNextTrack|MediaPlayPause|MediaPrevTrack|MediaStop)$/`
   );