diff --git a/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/LinuxDistributionBuilder.groovy b/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/LinuxDistributionBuilder.groovy
index ef05e9ef8c01..17a2819fb161 100644
--- a/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/LinuxDistributionBuilder.groovy
+++ b/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/LinuxDistributionBuilder.groovy
@@ -196,7 +196,7 @@ class LinuxDistributionBuilder extends OsSpecificDistributionBuilder {
     buildContext.messages.block("Build Linux .snap package") {
       buildContext.messages.progress("Preparing files")
 
-      def desktopTemplate = "${buildContext.paths.communityHome}/platform/build-scripts/resources/linux/snap/entry.desktop"
+      def desktopTemplate = "${buildContext.paths.communityHome}/platform/platform-resources/src/entry.desktop"
       def productName = buildContext.applicationInfo.productNameWithEdition
       buildContext.ant.copy(file: desktopTemplate, tofile: "${snapDir}/snap/gui/${customizer.snapName}.desktop") {
         filterset(begintoken: '$', endtoken: '$') {
diff --git a/platform/build-scripts/resources/linux/snap/entry.desktop b/platform/build-scripts/resources/linux/snap/entry.desktop
deleted file mode 100644
index 3ade2d69ef0e..000000000000
--- a/platform/build-scripts/resources/linux/snap/entry.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=$NAME$
-Icon=$ICON$
-Exec=$SCRIPT$ %f
-Comment=The Drive to Develop
-Categories=Development;IDE;
-Terminal=false
-StartupWMClass=$WM_CLASS$
diff --git a/platform/platform-impl/src/com/intellij/ide/actions/CreateDesktopEntryAction.java b/platform/platform-impl/src/com/intellij/ide/actions/CreateDesktopEntryAction.java
index e90b75838eea..595e922585fe 100644
--- a/platform/platform-impl/src/com/intellij/ide/actions/CreateDesktopEntryAction.java
+++ b/platform/platform-impl/src/com/intellij/ide/actions/CreateDesktopEntryAction.java
@@ -154,7 +154,7 @@ public class CreateDesktopEntryAction extends DumbAwareAction {
       throw new RuntimeException(ApplicationBundle.message("desktop.entry.icon.missing", binPath));
     }
 
-    String execPath = ourScript.getValue();
+    String execPath = String.format("\"%s\"", ourScript.getValue());
     if (execPath == null) {
       throw new RuntimeException(ApplicationBundle.message("desktop.entry.script.missing", binPath));
     }
diff --git a/platform/platform-resources/src/entry.desktop b/platform/platform-resources/src/entry.desktop
index 229f45fd9299..ba5cf3575f14 100644
--- a/platform/platform-resources/src/entry.desktop
+++ b/platform/platform-resources/src/entry.desktop
@@ -3,7 +3,7 @@ Version=1.0
 Type=Application
 Name=$NAME$
 Icon=$ICON$
-Exec="$SCRIPT$" %f
+Exec=$SCRIPT$ %f
 Comment=The Drive to Develop
 Categories=Development;IDE;
 Terminal=false