diff --git a/src/atom-window.coffee b/src/atom-window.coffee
index 19a27e8d8..0bb10e7f0 100644
--- a/src/atom-window.coffee
+++ b/src/atom-window.coffee
@@ -12,8 +12,10 @@ class AtomWindow
     @browserWindow = new BrowserWindow show: false, title: 'Atom'
     @handleEvents()
 
-    url = "file://#{resourcePath}/static/index.html#bootstrapScript=#{bootstrapScript}&resourcePath=#{resourcePath}"
-    url += "&pathToOpen=#{@pathToOpen}" if @pathToOpen
+    url = "file://#{resourcePath}/static/index.html#"
+    url += "bootstrapScript=#{encodeURIComponent(bootstrapScript)}"
+    url += "&resourcePath=#{encodeURIComponent(resourcePath)}"
+    url += "&pathToOpen=#{encodeURIComponent(@pathToOpen)}" if @pathToOpen
     url += '&exitWhenDone=1' if exitWhenDone
 
     @browserWindow.loadUrl url