diff --git a/src/browser/atom-application.coffee b/src/browser/atom-application.coffee
index 1ecbe9570..52fc08c21 100644
--- a/src/browser/atom-application.coffee
+++ b/src/browser/atom-application.coffee
@@ -18,7 +18,7 @@ DefaultSocketPath =
   if process.platform is 'win32'
     '\\\\.\\pipe\\atom-sock'
   else
-    path.join(os.tmpdir(), 'atom.sock')
+    path.join(os.tmpdir(), "atom_#{process.env['USER']}.sock")
 
 # The application's singleton class.
 #