--- a/background.js	Sun Nov 25 13:27:47 2018 +0100
+++ b/background.js	Sun Nov 25 13:53:02 2018 +0100
@@ -25,20 +25,36 @@
     });
 }
 
-async function moveTab(tab, targetWindowId) {
-    browser.tabs.move(tab.id, {windowId: targetWindowId, index: -1});
+async function moveTabs(tab, targetWindowId) {
+    // if the current tab is part of a highlighted group then move the whole
+    // group
+    let selectedTabs = (tab.highlighted) ? await browser.tabs.query({
+        highlighted: true,
+        windowId: tab.windowId
+    }) : [tab];
+    browser.tabs.move(selectedTabs.map(selectedTab => selectedTab.id),
+            {windowId: targetWindowId, index: -1});
 }
 
-async function reopenTab(tab, targetWindowId) {
-    if (!ALLOWED_PROTOCOLS.has(new URL(tab.url).protocol)) {
-        // privileged tab URL which cannot be reopened
+async function reopenTabs(tab, targetWindowId) {
+    // if the current tab is part of a highlighted group then reopen the whole
+    // group
+    let selectedTabs = (tab.highlighted) ? await browser.tabs.query({
+        highlighted: true,
+        windowId: tab.windowId
+    }) : [tab];
+    // filter out privileged tabs which cannot be reopened
+    selectedTabs = selectedTabs.filter(selectedTab =>
+            ALLOWED_PROTOCOLS.has(new URL(selectedTab.url).protocol));
+    if (selectedTabs.length === 0) {
         return;
     }
-    await browser.tabs.create({
-        url: tab.url,
+
+    await Promise.all(selectedTabs.map(selectedTab => browser.tabs.create({
+        url: selectedTab.url,
         windowId: targetWindowId
-    });
-    browser.tabs.remove(tab.id);
+    })));
+    browser.tabs.remove(selectedTabs.map(selectedTab => selectedTab.id));
 }
 
 async function onMenuShown(info, tab)  {
@@ -58,14 +74,14 @@
         }
         if (tab.incognito === targetWindow.incognito) {
             creatingMenus.push(createMenuItem({
-                onclick: (info, tab) => moveTab(tab, targetWindow.id),
+                onclick: (info, tab) => moveTabs(tab, targetWindow.id),
                 parentId: 'move-menu',
                 title: targetWindow.title
             }));
             moveMenuItems++;
         } else {
             creatingMenus.push(createMenuItem({
-                onclick: (info, tab) => reopenTab(tab, targetWindow.id),
+                onclick: (info, tab) => reopenTabs(tab, targetWindow.id),
                 parentId: 'reopen-menu',
                 title: targetWindow.title
             }));