diff --git a/assets/linux/emuflight-configurator.desktop b/assets/linux/emuflight-configurator-installed.desktop
similarity index 100%
rename from assets/linux/emuflight-configurator.desktop
rename to assets/linux/emuflight-configurator-installed.desktop
diff --git a/assets/linux/emuflight-configurator-localfolder.desktop b/assets/linux/emuflight-configurator-localfolder.desktop
new file mode 100644
index 000000000..8d3e94c48
--- /dev/null
+++ b/assets/linux/emuflight-configurator-localfolder.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Name=Emuflight Configurator
+Comment=Crossplatform configuration tool for the Emuflight flight control system
+Exec=./emuflight-configurator
+Icon=./icon/emu_icon_128.png
+Terminal=false
+Type=Application
+Categories=Utility
diff --git a/gulpfile.js b/gulpfile.js
index 4573c248d..ac81411c3 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -590,8 +590,8 @@ function release_deb(arch, done) {
              maintainer: pkg.author,
              description: pkg.description,
              preinst: [`rm -rf ${LINUX_INSTALL_DIR}/${pkg.name}`],
-             postinst: [`chown root:root ${LINUX_INSTALL_DIR}`, `chown -R root:root ${LINUX_INSTALL_DIR}/${pkg.name}`, `xdg-desktop-menu install ${LINUX_INSTALL_DIR}/${pkg.name}/${pkg.name}.desktop`],
-             prerm: [`xdg-desktop-menu uninstall ${pkg.name}.desktop`],
+             postinst: [`chown root:root ${LINUX_INSTALL_DIR}`, `chown -R root:root ${LINUX_INSTALL_DIR}/${pkg.name}`, `xdg-desktop-menu install ${LINUX_INSTALL_DIR}/${pkg.name}/${pkg.name}-installed.desktop`],
+             prerm: [`xdg-desktop-menu uninstall ${pkg.name}-installed.desktop`],
              depends: 'libgconf-2-4',
              changelog: [],
              _target: `${LINUX_INSTALL_DIR}/${pkg.name}`,
@@ -625,8 +625,8 @@ function release_rpm(arch, done) {
                  [ { cwd: path.join(APPS_DIR, pkg.name, arch),
                      src: '*',
                      dest: `${LINUX_INSTALL_DIR}/${pkg.name}` } ],
-             postInstallScript: [`xdg-desktop-menu install ${LINUX_INSTALL_DIR}/${pkg.name}/${pkg.name}.desktop`],
-             preUninstallScript: [`xdg-desktop-menu uninstall ${pkg.name}.desktop`],
+             postInstallScript: [`xdg-desktop-menu install ${LINUX_INSTALL_DIR}/${pkg.name}/${pkg.name}-installed.desktop`],
+             preUninstallScript: [`xdg-desktop-menu uninstall ${pkg.name}-installed.desktop`],
              tempDir: path.join(RELEASE_DIR,'tmp-rpm-build-' + arch),
              keepTemp: false,
              verbose: false,