diff --git a/src/packages/collaboration/lib/collaboration.coffee b/src/packages/collaboration/lib/collaboration.coffee
index c29115418..d02addd5f 100644
--- a/src/packages/collaboration/lib/collaboration.coffee
+++ b/src/packages/collaboration/lib/collaboration.coffee
@@ -23,6 +23,7 @@ module.exports =
 
       rootView.command 'collaboration:join-session', ->
         new JoinPromptView (id) ->
+          return unless id
           windowSettings =
             bootstrapScript: require.resolve('collaboration/lib/bootstrap')
             resourcePath: window.resourcePath
diff --git a/src/packages/collaboration/lib/join-prompt-view.coffee b/src/packages/collaboration/lib/join-prompt-view.coffee
index 4ed5a22be..f7a3505f1 100644
--- a/src/packages/collaboration/lib/join-prompt-view.coffee
+++ b/src/packages/collaboration/lib/join-prompt-view.coffee
@@ -30,7 +30,7 @@ class JoinPromptView extends View
     @miniEditor.setText('')
 
   confirm: ->
-    @confirmed(@miniEditor.getText())
+    @confirmed(@miniEditor.getText().trim())
     @remove()
 
   attach: ->