diff --git a/src/_locales b/src/_locales
index 417e629..1b944a2 160000
--- a/src/_locales
+++ b/src/_locales
@@ -1 +1 @@
-Subproject commit 417e6294ed767914b617a5e56ccbe67482df181c
+Subproject commit 1b944a2cbd8577c8ca928729ff1439dd30ce8269
diff --git a/src/js/background/backgroundLogic.js b/src/js/background/backgroundLogic.js
index 8a749d9..39c99f1 100644
--- a/src/js/background/backgroundLogic.js
+++ b/src/js/background/backgroundLogic.js
@@ -15,6 +15,11 @@ const backgroundLogic = {
   unhideQueue: [],
   init() {
     browser.commands.onCommand.addListener(function (command) {
+      if (command === "sort_tabs") {
+        backgroundLogic.sortTabs();
+        return;
+      }
+
       for (let i=0; i < backgroundLogic.NUMBER_OF_KEYBOARD_SHORTCUTS; i++) {
         const key = "open_container_" + i;
         const cookieStoreId = identityState.keyboardShortcut[key];
diff --git a/src/manifest.json b/src/manifest.json
index e0f9765..7f4aefc 100644
--- a/src/manifest.json
+++ b/src/manifest.json
@@ -43,6 +43,13 @@
       },
       "description": "Open containers panel"
     },
+    "sort_tabs": {
+      "suggested_key": {
+        "default": "Ctrl+Comma",
+        "mac": "MacCtrl+Comma"
+      },
+      "description": "Sort tabs by container"
+    },
     "open_container_0": {
       "suggested_key": {
         "default": "Ctrl+Shift+1"