2 files changed, 3 insertions, 2 deletions
diff --git a/frontend/views/page/components/page.editor.js b/frontend/views/page/components/page.editor.js
index 3878208..24e2075 100644
--- a/frontend/views/page/components/page.editor.js
+++ b/frontend/views/page/components/page.editor.js
@@ -158,7 +158,7 @@ class PageEditor extends Component {
   }
 
   render(){
-    if (!this.state.bounds || !this.props.page.show.res) {
+    if (!this.state.bounds || (!this.props.page.show.res && !this.props.page.show.res.tiles)) {
       return (
         <div className='page' ref={this.pageRef} />
       )
diff --git a/frontend/views/page/components/tile.form.js b/frontend/views/page/components/tile.form.js
index bfc5c0b..8d26173 100644
--- a/frontend/views/page/components/tile.form.js
+++ b/frontend/views/page/components/tile.form.js
@@ -117,9 +117,10 @@ class TileForm extends Component {
       errorFields: new Set([]),
     })
     const { pages } = graph.show.res
+    const linkPages = initialData ? pages.filter(page => page.id !== initialData.id) : pages
     let pageList = [
       ...PAGE_LIST_TOP_OPTIONS,
-      ...pages.map(page => ({ name: page.id, label: page.title }))
+      ...linkPages.map(page => ({ name: page.id, label: page.path }))
     ]
     this.setState({ pageList })
     if (isNew) {