diff --git a/app/initialize.js b/app/initialize.js
index 57ba8381..2222f4a0 100644
--- a/app/initialize.js
+++ b/app/initialize.js
@@ -16,11 +16,10 @@ async function initialize () {
 
   await step('[0] Get spaceKey from window.location', () => {
     let spaceKey = null
-    if (config.isPlatform) {
-      const wsPathPattern = /^\/ws\/([^\/]+)$/
-      const match = wsPathPattern.exec(urlPath)
-      if (match) spaceKey = match[1]
-    }
+    const wsPathPattern = /^\/ws\/([^\/]+)\/?$/
+    const match = wsPathPattern.exec(urlPath)
+    if (match) spaceKey = match[1]
+
     if (!spaceKey) spaceKey = qs.parse(window.location.hash.slice(1)).spaceKey
     if (spaceKey) config.spaceKey = spaceKey
     return true
diff --git a/app/workspaces_standalone/WorkspaceList.jsx b/app/workspaces_standalone/WorkspaceList.jsx
index 263fa652..6eb9d23a 100644
--- a/app/workspaces_standalone/WorkspaceList.jsx
+++ b/app/workspaces_standalone/WorkspaceList.jsx
@@ -86,7 +86,7 @@ class WorkspaceList extends Component {
               <div className='workspace-name'>{ws.projectName}</div>
               <div className='workspace-action'>
                 <a className='btn btn-default'
-                  href={'/workspace.html#spaceKey=' + ws.spaceKey}
+                  href={`/ws/${ws.spaceKey}`}
                   onClick={e => openWorkspace(ws)}>Open</a>
                 <button className='btn btn-danger'
                   style={{marginLeft: '4px'}}