diff --git a/app/build/resources/linux/mailspring.desktop.in b/app/build/resources/linux/Mailspring.desktop.in
similarity index 100%
rename from app/build/resources/linux/mailspring.desktop.in
rename to app/build/resources/linux/Mailspring.desktop.in
diff --git a/app/build/resources/linux/redhat/mailspring.spec.in b/app/build/resources/linux/redhat/mailspring.spec.in
index fd6389538..fc26d7729 100644
--- a/app/build/resources/linux/redhat/mailspring.spec.in
+++ b/app/build/resources/linux/redhat/mailspring.spec.in
@@ -35,7 +35,7 @@ ln -s ../share/mailspring/mailspring %{buildroot}/usr/bin/mailspring
 chmod 755 %{buildroot}/usr/bin/mailspring
 
 mkdir -p %{buildroot}/usr/share/applications/
-mv mailspring.desktop %{buildroot}/usr/share/applications/
+mv Mailspring.desktop %{buildroot}/usr/share/applications/
 
 mkdir -p %{buildroot}/usr/share/appdata/
 mv mailspring.appdata.xml %{buildroot}/usr/share/appdata/
@@ -48,7 +48,7 @@ done
 %files
 /usr/bin/mailspring
 /usr/share/mailspring
-/usr/share/applications/mailspring.desktop
+/usr/share/applications/Mailspring.desktop
 /usr/share/appdata/mailspring.appdata.xml
 /usr/share/icons/hicolor/16x16/apps/mailspring.png
 /usr/share/icons/hicolor/32x32/apps/mailspring.png
diff --git a/app/build/tasks/installer-linux-task.js b/app/build/tasks/installer-linux-task.js
index fd4f44435..2e29aa057 100644
--- a/app/build/tasks/installer-linux-task.js
+++ b/app/build/tasks/installer-linux-task.js
@@ -58,8 +58,8 @@ module.exports = grunt => {
     const specInFilePath = path.join(linuxAssetsDir, 'redhat', 'mailspring.spec.in');
     writeFromTemplate(specInFilePath, templateData);
 
-    // This populates mailspring.desktop
-    const desktopInFilePath = path.join(linuxAssetsDir, 'mailspring.desktop.in');
+    // This populates Mailspring.desktop
+    const desktopInFilePath = path.join(linuxAssetsDir, 'Mailspring.desktop.in');
     writeFromTemplate(desktopInFilePath, templateData);
 
     // This populates mailspring.appdata.xml
@@ -103,7 +103,7 @@ module.exports = grunt => {
         installedSize: installedSize,
       };
       writeFromTemplate(path.join(linuxAssetsDir, 'debian', 'control.in'), data);
-      writeFromTemplate(path.join(linuxAssetsDir, 'mailspring.desktop.in'), data);
+      writeFromTemplate(path.join(linuxAssetsDir, 'Mailspring.desktop.in'), data);
       writeFromTemplate(path.join(linuxAssetsDir, 'mailspring.appdata.xml.in'), data);
 
       const icon = path.join(
diff --git a/app/script/mkdeb b/app/script/mkdeb
index 7fddd218d..5dca0e838 100755
--- a/app/script/mkdeb
+++ b/app/script/mkdeb
@@ -35,7 +35,7 @@ ln -s "../share/mailspring/mailspring" "$TARGET/usr/bin/mailspring"
 chmod +x "$TARGET/usr/bin/mailspring"
 
 mkdir -m $FILE_MODE -p "$TARGET/usr/share/applications"
-cp "$OUTPUT_PATH/mailspring.desktop" "$TARGET/usr/share/applications"
+cp "$OUTPUT_PATH/Mailspring.desktop" "$TARGET/usr/share/applications"
 mkdir -m $FILE_MODE -p "$TARGET/usr/share/appdata"
 cp "$OUTPUT_PATH/mailspring.appdata.xml" "$TARGET/usr/share/appdata"
 
diff --git a/app/script/mkrpm b/app/script/mkrpm
index 38cc79d95..dba097a7e 100755
--- a/app/script/mkrpm
+++ b/app/script/mkrpm
@@ -22,7 +22,7 @@ mkdir -p $RPM_BUILD_ROOT/RPMS
 cp -r "$APP_CONTENTS_DIRECTORY/"* "$RPM_BUILD_ROOT/BUILD"
 cp -r "$LINUX_ASSETS_DIRECTORY/icons" "$RPM_BUILD_ROOT/BUILD"
 cp "$BUILD_DIRECTORY/mailspring.spec" "$RPM_BUILD_ROOT/SPECS"
-cp "$BUILD_DIRECTORY/mailspring.desktop" "$RPM_BUILD_ROOT/BUILD"
+cp "$BUILD_DIRECTORY/Mailspring.desktop" "$RPM_BUILD_ROOT/BUILD"
 cp "$BUILD_DIRECTORY/mailspring.appdata.xml" "$RPM_BUILD_ROOT/BUILD"
 
 rpmbuild -ba "$BUILD_DIRECTORY/mailspring.spec"
diff --git a/app/src/default-client-helper.ts b/app/src/default-client-helper.ts
index a38a17ca1..a36b8c024 100644
--- a/app/src/default-client-helper.ts
+++ b/app/src/default-client-helper.ts
@@ -103,7 +103,7 @@ export class DefaultClientHelperLinux {
       throw new Error('isRegisteredForURLScheme is async, provide a callback');
     }
     exec(`xdg-mime query default x-scheme-handler/${scheme}`, (err, stdout) =>
-      err ? callback(err) : callback(stdout.trim() === 'mailspring.desktop')
+      err ? callback(err) : callback(stdout.trim() === 'Mailspring.desktop')
     );
   }
 
@@ -113,7 +113,7 @@ export class DefaultClientHelperLinux {
     );
   }
   registerForURLScheme(scheme, callback = (error?: Error, result?: null) => {}) {
-    exec(`xdg-mime default mailspring.desktop x-scheme-handler/${scheme}`, err =>
+    exec(`xdg-mime default Mailspring.desktop x-scheme-handler/${scheme}`, err =>
       err ? callback(err) : callback(null, null)
     );
   }
diff --git a/app/src/system-start-service.ts b/app/src/system-start-service.ts
index 1ed188253..d0cdd9500 100644
--- a/app/src/system-start-service.ts
+++ b/app/src/system-start-service.ts
@@ -193,12 +193,12 @@ class SystemStartServiceLinux extends SystemStartServiceBase {
   }
 
   _launcherPath() {
-    return path.join('/', 'usr', 'share', 'applications', 'mailspring.desktop');
+    return path.join('/', 'usr', 'share', 'applications', 'Mailspring.desktop');
   }
 
   _shortcutPath() {
     const configDir = process.env.XDG_CONFIG_HOME || path.join(os.homedir(), '.config');
-    return path.join(configDir, 'autostart', 'mailspring.desktop');
+    return path.join(configDir, 'autostart', 'Mailspring.desktop');
   }
 }
 
diff --git a/snap/snapcraft.template.yaml b/snap/snapcraft.template.yaml
index 90b1af4fe..6365e4a7b 100644
--- a/snap/snapcraft.template.yaml
+++ b/snap/snapcraft.template.yaml
@@ -27,7 +27,7 @@ parts:
     source-type: deb
     # Correct path to icon.
     prepare: |
-      sed -i 's|Icon=mailspring|Icon=/usr/share/pixmaps/mailspring\.png|' usr/share/applications/mailspring.desktop
+      sed -i 's|Icon=mailspring|Icon=/usr/share/pixmaps/mailspring\.png|' usr/share/applications/Mailspring.desktop
       mkdir -p $SNAPCRAFT_PART_INSTALL/share/themes
       mkdir -p $SNAPCRAFT_PART_INSTALL/share/icons
       mkdir -p $SNAPCRAFT_PART_INSTALL/share/sounds
@@ -54,7 +54,7 @@ parts:
 apps:
   mailspring:
     command: desktop-launch $SNAP/usr/share/mailspring/mailspring
-    desktop: usr/share/applications/mailspring.desktop
+    desktop: usr/share/applications/Mailspring.desktop
     environment:
       # Correct the TMPDIR path for Chromium Framework/Electron to
       # ensure libappindicator has readable resources.