diff --git a/autotests/integration/shell_client_test.cpp b/autotests/integration/shell_client_test.cpp
index 5edf5b4b7c..b5900895d1 100644
--- a/autotests/integration/shell_client_test.cpp
+++ b/autotests/integration/shell_client_test.cpp
@@ -778,6 +778,8 @@ void TestShellClient::testDesktopFileName()
     auto c = Test::renderAndWaitForShown(surface.data(), QSize(100, 50), Qt::blue);
     QVERIFY(c);
     QCOMPARE(c->desktopFileName(), QByteArrayLiteral("org.kde.foo"));
+    QCOMPARE(c->resourceClass(), QByteArrayLiteral("org.kde.foo"));
+    QVERIFY(c->resourceName().startsWith("testShellClient"));
     // the desktop file does not exist, so icon should be generic Wayland
     QCOMPARE(c->icon().name(), QStringLiteral("wayland"));
 
@@ -788,6 +790,8 @@ void TestShellClient::testDesktopFileName()
     shellSurface->setAppId(QByteArrayLiteral("org.kde.bar"));
     QVERIFY(desktopFileNameChangedSpy.wait());
     QCOMPARE(c->desktopFileName(), QByteArrayLiteral("org.kde.bar"));
+    QCOMPARE(c->resourceClass(), QByteArrayLiteral("org.kde.bar"));
+    QVERIFY(c->resourceName().startsWith("testShellClient"));
     // icon should still be wayland
     QCOMPARE(c->icon().name(), QStringLiteral("wayland"));
     QVERIFY(iconChangedSpy.isEmpty());
diff --git a/shell_client.cpp b/shell_client.cpp
index f2e1a2ab31..59f5a32930 100644
--- a/shell_client.cpp
+++ b/shell_client.cpp
@@ -51,6 +51,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <KDesktopFile>
 
+#include <QFileInfo>
 #include <QOpenGLFramebufferObject>
 #include <QWindow>
 
@@ -126,11 +127,18 @@ void ShellClient::initSurface(T *shellSurface)
         }
     );
 
-    setResourceClass(shellSurface->windowClass());
+    // determine the resource name, this is inspired from ICCCM 4.1.2.5
+    // the binary name of the invoked client
+    QFileInfo info{shellSurface->client()->executablePath()};
+    QByteArray resourceName;
+    if (info.exists()) {
+        resourceName = info.fileName().toUtf8();
+    }
+    setResourceClass(resourceName, shellSurface->windowClass());
     setDesktopFileName(shellSurface->windowClass());
     connect(shellSurface, &T::windowClassChanged, this,
-        [this] (const QByteArray &windowClass) {
-            setResourceClass(windowClass);
+        [this, resourceName] (const QByteArray &windowClass) {
+            setResourceClass(resourceName, windowClass);
             setDesktopFileName(windowClass);
         }
     );