diff --git a/src/js/background/messageHandler.js b/src/js/background/messageHandler.js
index f4236f1..02a2474 100644
--- a/src/js/background/messageHandler.js
+++ b/src/js/background/messageHandler.js
@@ -40,6 +40,9 @@ const messageHandler = {
           return assignManager._setOrRemoveAssignment(tab.id, m.url, m.userContextId, m.value);
         });
         break;
+      case "sortTabsByWindow":
+        backgroundLogic.sortTabsByWindow();
+        break;
       case "sortTabs":
         backgroundLogic.sortTabs();
         break;
diff --git a/src/js/popup.js b/src/js/popup.js
index 1349ffa..7aa1757 100644
--- a/src/js/popup.js
+++ b/src/js/popup.js
@@ -599,6 +599,17 @@ Logic.registerPanel(P_CONTAINERS_LIST, {
       }
     });
 
+    Logic.addEnterHandler(document.querySelector("#sort-containers-link-window"), async () => {
+      try {
+        await browser.runtime.sendMessage({
+          method: "sortTabsByWindow"
+        });
+        window.close();
+      } catch (e) {
+        window.close();
+      }
+    });
+
     Logic.addEnterHandler(document.querySelector("#sort-containers-link"), async () => {
       try {
         await browser.runtime.sendMessage({