diff --git a/atom/browser/default_app/main.js b/atom/browser/default_app/main.js
index 8f6e3874031..c7ea581cefa 100644
--- a/atom/browser/default_app/main.js
+++ b/atom/browser/default_app/main.js
@@ -41,6 +41,7 @@ if (option.file && !option.webdriver) {
         app.setName(packageJson.productName);
       else if (packageJson.name)
         app.setName(packageJson.name);
+      app.setPath('userData', path.join(app.getPath('appData'), app.getName()));
     }
 
     // Run the app.
diff --git a/atom/browser/lib/init.coffee b/atom/browser/lib/init.coffee
index ae2419b2199..b0cee6badf4 100644
--- a/atom/browser/lib/init.coffee
+++ b/atom/browser/lib/init.coffee
@@ -90,6 +90,9 @@ process.once 'BIND_DONE', ->
   else
     app.setDesktopName '#{app.getName()}.desktop'
 
+  # Set the user data path according to application's name.
+  app.setPath 'userData', path.join(app.getPath('appData'), app.getName())
+
   # Load the chrome extension support.
   require './chrome-extension.js'