diff --git a/src/atom-application.coffee b/src/atom-application.coffee
index 520389efb..bfcb0256f 100644
--- a/src/atom-application.coffee
+++ b/src/atom-application.coffee
@@ -8,6 +8,7 @@ dialog = require 'dialog'
 fs = require 'fs'
 path = require 'path'
 net = require 'net'
+url = require 'url'
 
 socketPath = '/tmp/atom.sock'
 
@@ -171,6 +172,16 @@ class AtomApplication
       event.preventDefault()
       @openPath({pathToOpen})
 
+    app.on 'open-url', (event, urlToOpen) =>
+      event.preventDefault()
+
+      parsedUrl = url.parse(urlToOpen)
+      if parsedUrl.host is 'session'
+        sessionId = parsedUrl.path.split('/')[1]
+        if sessionId
+          bootstrapScript = 'collaboration/lib/bootstrap'
+          new AtomWindow({bootstrapScript, @resourcePath, sessionId})
+
     autoUpdater.on 'ready-for-update-on-quit', (event, version, quitAndUpdate) =>
       event.preventDefault()
       @installUpdate = quitAndUpdate
diff --git a/src/main.coffee b/src/main.coffee
index 69f1c8115..9d69b94b9 100644
--- a/src/main.coffee
+++ b/src/main.coffee
@@ -22,13 +22,6 @@ delegate.browserMainParts.preMainMessageLoopRun = ->
     event.preventDefault()
     args.pathsToOpen.push(filePath)
 
-  app.on 'open-url', (event, url) =>
-    event.preventDefault()
-    dialog.showMessageBox
-      message: 'Atom opened with URL'
-      detail: url
-      buttons: ['OK']
-
   app.on 'open-file', addPathToOpen
 
   app.on 'will-finish-launching', ->