diff --git a/electron/src/main.ts b/electron/src/main.ts
index 4d69294c..41f8932b 100644
--- a/electron/src/main.ts
+++ b/electron/src/main.ts
@@ -47,6 +47,7 @@ function createWindow() {
     // Set window class explicitly for Linux/GNOME integration
     title: "QiTech Control",
     titleBarStyle: "hidden",
+    className: "de.qitech.control-electron" 
   });
   
   // Set the window class name for Linux WM_CLASS property
diff --git a/nixos/packages/electron.nix b/nixos/packages/electron.nix
index 5d9508fe..f64ffab0 100644
--- a/nixos/packages/electron.nix
+++ b/nixos/packages/electron.nix
@@ -94,6 +94,7 @@ stdenv.mkDerivation rec {
       --class=de.qitech.control-electron \
       --name="QiTech Control" \
       --single-instance \
+      --winrm-class="de.qitech.control-electron" \
       "\$@"
     EOF
     chmod +x $out/bin/qitech-control-electron
@@ -101,12 +102,12 @@ stdenv.mkDerivation rec {
     # Create desktop entry with consistent application ID
     cat > $out/share/applications/de.qitech.control-electron.desktop << EOF
     [Desktop Entry]
+    Type=Application
     Name=QiTech Control
     Comment=QiTech Industries Control Software
     Exec=qitech-control-electron %U
     Icon=de.qitech.control-electron
     Terminal=false
-    Type=Application
     StartupWMClass=de.qitech.control-electron
     Categories=Development;Engineering;
     X-GNOME-UsesNotifications=true