diff --git a/build/gulpfile.vscode.js b/build/gulpfile.vscode.js
index 358b1bdca08..26e10b0402a 100644
--- a/build/gulpfile.vscode.js
+++ b/build/gulpfile.vscode.js
@@ -270,6 +270,7 @@ function prepareDebPackage(arch) {
 	return function () {
 		var desktop = gulp.src('resources/linux/code.desktop', { base: '.' })
 			.pipe(replace('@@NAME_LONG@@', product.nameLong))
+			.pipe(replace('@@NAME_SHORT@@', product.nameShort))
 			.pipe(replace('@@NAME@@', product.applicationName))
 			.pipe(rename('usr/share/applications/' + product.applicationName + '.desktop'));
 
@@ -340,6 +341,7 @@ function prepareRpmPackage(arch) {
 	return function () {
 		var desktop = gulp.src('resources/linux/code.desktop', { base: '.' })
 			.pipe(replace('@@NAME_LONG@@', product.nameLong))
+			.pipe(replace('@@NAME_SHORT@@', product.nameShort))
 			.pipe(replace('@@NAME@@', product.applicationName))
 			.pipe(rename('BUILD/usr/share/applications/' + product.applicationName + '.desktop'));
 
diff --git a/resources/linux/code.desktop b/resources/linux/code.desktop
index d8dbc267ecb..2a835b43508 100644
--- a/resources/linux/code.desktop
+++ b/resources/linux/code.desktop
@@ -6,7 +6,7 @@ Exec=/usr/bin/@@NAME@@ %U
 Icon=@@NAME@@
 Type=Application
 StartupNotify=true
-StartupWMClass=@@NAME@@
+StartupWMClass=@@NAME_SHORT@@
 Categories=Utility;TextEditor;Development;IDE;
 MimeType=text/plain;
 Actions=new-window;