diff --git a/winehelper b/winehelper
index 325cfa9..70d6d80 100755
--- a/winehelper
+++ b/winehelper
@@ -617,6 +617,7 @@ create_desktop () {
         echo "StartupNotify=true"
         echo "Path=$DATA_PATH"
         echo "Icon=$icon_file"
+        echo "StartupWMClass=$(basename "$exe_file")"
     } > "$USER_WORK_PATH/$desktop_filename.desktop"
     chmod +x "$USER_WORK_PATH/$desktop_filename.desktop"
 
diff --git a/winehelper.desktop b/winehelper.desktop
index e6ef5e0..1a3aae9 100644
--- a/winehelper.desktop
+++ b/winehelper.desktop
@@ -1,3 +1,4 @@
+#!/usr/bin/env xdg-open
 [Desktop Entry]
 Name=WineHelper
 Exec=winehelper gui %F
@@ -7,3 +8,4 @@ Type=Application
 Categories=WineHelper;Utility;Emulator;
 StartupNotify=true
 Icon=winehelper
+StartupWMClass=winehelper