diff --git a/demo/Page/components/Edit/index.js b/demo/Page/components/Edit/index.js
index edee58bb64..6bfa4e2fea 100644
--- a/demo/Page/components/Edit/index.js
+++ b/demo/Page/components/Edit/index.js
@@ -35,6 +35,9 @@ class Edit extends Component {
   }
 
   render() {
+
+    const initialData = this.props.data ? this.props.data : {};
+
     return (
       <EditView data={this.props.data} collection={this.collection} slug={this.state.slug} uid={this.state.uid}>
         <Form method="post" action={`${config.serverUrl}/${this.collection.slug}`}>
@@ -46,9 +49,9 @@ class Edit extends Component {
               <FormSubmit>Save</FormSubmit>
             </div>
           </Sticky>
-          <Input onChange={this.updateSlug} type="text" label="Page Title" name="title" required />
+          <Input onChange={this.updateSlug} type="text" label="Page Title" value={initialData.title} name="title" required />
           <Group heading="Sample Group">
-            <Textarea required name="content" label="Page Content" wysiwyg={false} height={100} />
+            <Textarea required name="content" label="Page Content" wysiwyg={false} height={100} value={initialData.content} />
           </Group>
         </Form>
       </EditView>
diff --git a/src/components/field-types/Input/index.js b/src/components/field-types/Input/index.js
index 22975e65c1..9416cc63b5 100644
--- a/src/components/field-types/Input/index.js
+++ b/src/components/field-types/Input/index.js
@@ -93,7 +93,7 @@ class Input extends Component {
       ? this.props.value
       : '';
 
-    const contextValue = this.props.context.fields[this.props.name]
+    const contextValue = (this.props.context.fields[this.props.name] && this.props.context.fields[this.props.name].value)
       ? this.props.context.fields[this.props.name].value
       : initialValue;
 
diff --git a/src/components/field-types/Textarea/index.js b/src/components/field-types/Textarea/index.js
index d93fbfd1a7..5e692a34ec 100644
--- a/src/components/field-types/Textarea/index.js
+++ b/src/components/field-types/Textarea/index.js
@@ -92,7 +92,7 @@ class Textarea extends Component {
       ? this.props.value
       : '';
 
-    const contextValue = this.props.context.fields[this.props.name]
+    const contextValue = (this.props.context.fields[this.props.name] && this.props.context.fields[this.props.name].value)
       ? this.props.context.fields[this.props.name].value
       : initialValue;