diff --git a/resources/linux/launchers/org.kicad.bitmap2component.desktop.in b/resources/linux/launchers/org.kicad.bitmap2component.desktop.in
index e6e7ac3da3..04a161eafe 100644
--- a/resources/linux/launchers/org.kicad.bitmap2component.desktop.in
+++ b/resources/linux/launchers/org.kicad.bitmap2component.desktop.in
@@ -5,6 +5,7 @@ Icon=bitmap2component
 Type=Application
 Categories=Science;Electronics;
 Exec=bitmap2component %f
+StartupWMClass=bitmap2component
 Name=KiCad Image Converter
 GenericName=Bitmap to Component Converter
 Comment=Create a component from a bitmap for use with KiCad
diff --git a/resources/linux/launchers/org.kicad.eeschema.desktop.in b/resources/linux/launchers/org.kicad.eeschema.desktop.in
index 6fc88004ac..795fcf57a7 100644
--- a/resources/linux/launchers/org.kicad.eeschema.desktop.in
+++ b/resources/linux/launchers/org.kicad.eeschema.desktop.in
@@ -5,6 +5,7 @@ Icon=eeschema
 Type=Application
 Categories=Science;Electronics;
 Exec=eeschema %f
+StartupWMClass=eeschema
 MimeType=application/x-kicad-schematic;
 Name=KiCad Schematic Editor (Standalone)
 GenericName=Schematic Capture Tool
diff --git a/resources/linux/launchers/org.kicad.gerbview.desktop.in b/resources/linux/launchers/org.kicad.gerbview.desktop.in
index df2db17e0d..44131bb3eb 100644
--- a/resources/linux/launchers/org.kicad.gerbview.desktop.in
+++ b/resources/linux/launchers/org.kicad.gerbview.desktop.in
@@ -5,6 +5,7 @@ Icon=gerbview
 Type=Application
 Categories=Science;Electronics;
 Exec=gerbview %F
+StartupWMClass=gerbview
 MimeType=application/x-gerber;application/x-excellon;application/x-gerber-job
 Name=KiCad Gerber Viewer
 GenericName=Gerber File Viewer
diff --git a/resources/linux/launchers/org.kicad.kicad.desktop.in b/resources/linux/launchers/org.kicad.kicad.desktop.in
index cadf381887..e812e4b31b 100644
--- a/resources/linux/launchers/org.kicad.kicad.desktop.in
+++ b/resources/linux/launchers/org.kicad.kicad.desktop.in
@@ -5,6 +5,7 @@ Icon=kicad
 Type=Application
 Categories=Science;Electronics;
 Exec=kicad %f
+StartupWMClass=kicad
 MimeType=application/x-kicad-project;
 Name=KiCad
 GenericName=EDA Suite
diff --git a/resources/linux/launchers/org.kicad.pcbcalculator.desktop.in b/resources/linux/launchers/org.kicad.pcbcalculator.desktop.in
index 9d590bfba4..1c8ae53e0b 100644
--- a/resources/linux/launchers/org.kicad.pcbcalculator.desktop.in
+++ b/resources/linux/launchers/org.kicad.pcbcalculator.desktop.in
@@ -5,6 +5,7 @@ Icon=pcbcalculator
 Type=Application
 Categories=Science;Electronics;
 Exec=pcb_calculator
+StartupWMClass=pcb_calculator
 Name=KiCad PCB Calculator
 GenericName=PCB Calculator
 Comment=Calculator for various electronics-related computations
diff --git a/resources/linux/launchers/org.kicad.pcbnew.desktop.in b/resources/linux/launchers/org.kicad.pcbnew.desktop.in
index 844ba42b3f..e2ee11aa46 100644
--- a/resources/linux/launchers/org.kicad.pcbnew.desktop.in
+++ b/resources/linux/launchers/org.kicad.pcbnew.desktop.in
@@ -5,6 +5,7 @@ Icon=pcbnew
 Type=Application
 Categories=Science;Electronics;
 Exec=pcbnew %f
+StartupWMClass=pcbnew
 MimeType=application/x-kicad-pcb;
 Name=KiCad PCB Editor (Standalone)
 GenericName=PCB layout editor