diff --git a/README.bbcode b/README.bbcode
index 1d10325..09ed4fe 100644
--- a/README.bbcode
+++ b/README.bbcode
@@ -1,6 +1,6 @@
 Automatically raises all other visible windows of the same application together when activating one of them, effectively creating application groups to task-switch between.
 
-[b]Please make sure to install the most recent version (v1.5) and to not use Discover for installation.[/b] For more information on installation, setup and usage as well as any requests, please visit [url=https://github.com/nclarius/kwin-application-switcher]the GitHub page[/url].
+[b]Please make sure to install the most recent version (v1.6) and to not use Discover for installation.[/b] For more information on installation, setup and usage as well as any requests, please visit [url=https://github.com/nclarius/kwin-application-switcher]the GitHub page[/url].
 
 This extension gives rise to an application-centric task switching workflow as known from environments such as GNOME or MacOS, where an application’s windows are treated as a group, and task switching can take place at two levels: one mode for switching applications and one mode for switching between windows of an application. 
 
diff --git a/README.md b/README.md
index 03bda62..f8a190f 100644
--- a/README.md
+++ b/README.md
@@ -20,7 +20,7 @@ Seen in the screencast: Switching from Konsole back to Dolphin also brings the o
 
 ### Installation via graphical interface
 
-**Please make sure to select the most recent version (v1.5)** in the installation process.
+**Please make sure to select the most recent version (v1.6)** in the installation process.
 
 A [bug](https://bugs.kde.org/show_bug.cgi?id=453521) in Discover causes a wrong version to be installed, so using the installation module in System Settings instead is recommended.
 
@@ -55,7 +55,7 @@ If you are intending to have one mode for switching applications and one mode fo
 
 ### Limitations
 
-- The KWin scripting API provides no possibility to distinguish how a window was activated (via alt-tabbing, panel task bar clicking, clicking on the window, or being requested from another process), so the plugin can not be applied selectively to only some activation types.
+- The KWin scripting API provides no possibility to distinguish how a window was activated (via alt-tabbing, clicking on the task bar, clicking on the window, or being requested from another process), so the plugin can not be applied selectively to only some activation types.
 - The KWin scripting API provides no possibility to manipulate the recently used and stacking order without actually activating the window, so focus will briefly shift as windows are being brought to the front; however this happens so fast it shouldn’t be noticeable.
 
 ## Small Print
diff --git a/application-switcher_v1.5.kwinscript b/application-switcher_v1.6.kwinscript
similarity index 66%
rename from application-switcher_v1.5.kwinscript
rename to application-switcher_v1.6.kwinscript
index 5076e7a..0b77014 100644
Binary files a/application-switcher_v1.5.kwinscript and b/application-switcher_v1.6.kwinscript differ
diff --git a/contents/code/main.js b/contents/code/main.js
index 02610ab..5245f68 100644
--- a/contents/code/main.js
+++ b/contents/code/main.js
@@ -86,8 +86,8 @@ function getAppGroup(current) {
     if (!current) return;
     let appGroup = appGroups[getApp(current)].filter(window => window && 
         !window.minimized && 
-        (window.desktop == current.desktop ||
-         window.onAllDesktops || current.onAllDesktops));
+        (window.x11DesktopIds.includes(workspace.currentDesktop) || window.x11DesktopIds.length == 0) &&
+        (window.activities.includes(workspace.currentActivity) || window.activities.length == 0));
     debug("getting app group", appGroup.map(window => window.caption));
     return appGroup;
 }
diff --git a/metadata.json b/metadata.json
index 9f4beb3..e72013d 100644
--- a/metadata.json
+++ b/metadata.json
@@ -15,7 +15,7 @@
             "KWin/Script",
             "KCModule"
         ],
-        "Version": "1.5",
+        "Version": "1.6",
         "Website": ""
     },
     "X-Plasma-API": "javascript",