diff --git a/bin/remix-ide b/bin/remix-ide
index dc1dee70f9..5f658d0558 100755
--- a/bin/remix-ide
+++ b/bin/remix-ide
@@ -6,7 +6,7 @@ var server = httpServer.createServer({
     root: __dirname + '/../'
 })
 
-var folder = process.argv.length > 2 ? process.argv[2] : __dirname
+var folder = process.argv.length > 2 ? process.argv[2] : process.cwd()
 
 server.listen(8080, '127.0.0.1', function () {})
 var router = new remixd.Router()
diff --git a/package.json b/package.json
index 797f10ac35..904be06909 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "remix-ide",
-  "version": "0.5.2-alpha.8",
+  "version": "0.5.2-alpha.9",
   "description": "Minimalistic browser-based Solidity IDE",
   "devDependencies": {
     "async": "^2.1.2",