diff --git a/atom/browser/lib/init.coffee b/atom/browser/lib/init.coffee
index 00b3626eee8d..d25179c1ba49 100644
--- a/atom/browser/lib/init.coffee
+++ b/atom/browser/lib/init.coffee
@@ -81,7 +81,7 @@ setImmediate ->
   if packageJson.desktopName?
     app.setDesktopName packageJson.desktopName
   else 
-    app.setDesktopName 'atom-shell.desktop'
+    app.setDesktopName '#{app.getName()}.desktop'
 
   # Load the chrome extension support.
   require './chrome-extension.js'
diff --git a/docs/api/browser-window.md b/docs/api/browser-window.md
index 6e8a248ff9c5..dde8c160ba19 100644
--- a/docs/api/browser-window.md
+++ b/docs/api/browser-window.md
@@ -497,7 +497,7 @@ Change to indeterminate mode when progress > 1.
 
 On Linux platform, only supports Unity desktop environment, you need to specify
 the `*.desktop` file name to `desktopName` field in `package.json`. By default,
-it will assume `atom-shell.desktop`.
+it will assume `app.getName().desktop`.
 
 ## Class: WebContents