diff --git a/other/io.github.antimicrox.antimicrox.desktop b/other/io.github.antimicrox.antimicrox.desktop
index 8631922c4..dec6b5644 100644
--- a/other/io.github.antimicrox.antimicrox.desktop
+++ b/other/io.github.antimicrox.antimicrox.desktop
@@ -17,7 +17,6 @@ Categories=Game;Qt;Utility;
 MimeType=application/x-amgp;
 Keywords=game;controller;keyboard;joystick;mouse;
 Actions=run-in-tray;
-StartupWMClass=antimicrox
 
 [Desktop Action run-in-tray]
 Name=Open in system tray only
diff --git a/src/main.cpp b/src/main.cpp
index 04679b72b..17fd7efd3 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -419,6 +419,9 @@ int main(int argc, char *argv[])
     QTranslator qtTranslator;
 
 #if defined(Q_OS_UNIX)
+    // Ensure that the Wayland appId matches the .desktop file name
+    QGuiApplication::setDesktopFileName("io.github.antimicrox.antimicrox");
+
     installSignalHandlers();
 
     QString transPath = QLibraryInfo::location(QLibraryInfo::TranslationsPath);