diff --git a/src/js/background/backgroundLogic.js b/src/js/background/backgroundLogic.js
index a4d42d8..746d3b0 100644
--- a/src/js/background/backgroundLogic.js
+++ b/src/js/background/backgroundLogic.js
@@ -15,13 +15,25 @@ const backgroundLogic = {
   unhideQueue: [],
   init() {
     browser.commands.onCommand.addListener(function (command) {
-      for (let i=0; i < backgroundLogic.NUMBER_OF_KEYBOARD_SHORTCUTS; i++) {
-        const key = "open_container_" + i;
-        const cookieStoreId = identityState.keyboardShortcut[key];
-        if (command === key) {
-          if (cookieStoreId === "none") return;
-          browser.tabs.create({cookieStoreId});
-        }
+      switch (command) {
+      case "sort_tabs_by_container":
+        backgroundLogic.sortTabs();
+        break;
+      case "open_container_0":
+      case "open_container_1":
+      case "open_container_2":
+      case "open_container_3":
+      case "open_container_4":
+      case "open_container_5":
+      case "open_container_6":
+      case "open_container_7":
+      case "open_container_8":
+      case "open_container_9": {
+        const cookieStoreId = identityState.keyboardShortcut[command];
+        if (cookieStoreId === "none") return;
+        browser.tabs.create({cookieStoreId});
+        break;
+      }
       }
     });
 
diff --git a/src/manifest.json b/src/manifest.json
index 247497f..d0ecf47 100644
--- a/src/manifest.json
+++ b/src/manifest.json
@@ -43,6 +43,12 @@
       },
       "description": "Open containers panel"
     },
+    "sort_tabs_by_container": {
+      "suggested_key": {
+        "default": "Ctrl+Comma"
+      },
+      "description": "Sort tabs by container"
+    },
     "open_container_0": {
       "suggested_key": {
         "default": "Ctrl+Shift+1"