diff --git a/org.ppsspp.PPSSPP.yml b/org.ppsspp.PPSSPP.yml
index b95c563..ed2d963 100644
--- a/org.ppsspp.PPSSPP.yml
+++ b/org.ppsspp.PPSSPP.yml
@@ -15,6 +15,8 @@ finish-args:
   - --share=ipc
   - --share=network
   - --talk-name=org.freedesktop.ScreenSaver
+  - --env=SDL_VIDEO_X11_WMCLASS=org.ppsspp.PPSSPP
+  - --env=SDL_VIDEO_WAYLAND_WMCLASS=org.ppsspp.PPSSPP
 add-extensions:
   org.ppsspp.PPSSPP.Locale:
     directory: share/locale
@@ -46,7 +48,7 @@ modules:
             - -DUSING_EGL=ON
             - -DUSING_GLES2=ON
     post-install:
-      - desktop-file-edit --set-name=PPSSPP --set-key=StartupWMClass --set-value=PPSSPPSDL ${FLATPAK_DEST}/share/applications/PPSSPPSDL.desktop
+      - desktop-file-edit --set-name=PPSSPP ${FLATPAK_DEST}/share/applications/PPSSPPSDL.desktop
       - install -Dm644 icons/icon-512.svg ${FLATPAK_DEST}/share/icons/hicolor/scalable/apps/ppsspp.svg
       - install -Dm644 ${FLATPAK_ID}.metainfo.xml -t ${FLATPAK_DEST}/share/metainfo
     cleanup: