diff --git a/src/components/views/elements/EditableItemList.js b/src/components/views/elements/EditableItemList.js
index 267244759a..35e207daef 100644
--- a/src/components/views/elements/EditableItemList.js
+++ b/src/components/views/elements/EditableItemList.js
@@ -104,7 +104,7 @@ module.exports = React.createClass({
         if (value.length === 0) {
             this.onItemRemoved(index);
         } else {
-            this.onItemEdited(value, index);
+            this.props.onItemEdited(value, index);
         }
     },
 
diff --git a/src/components/views/elements/EditableText.js b/src/components/views/elements/EditableText.js
index 3ce8c90447..b6a0ec1d5c 100644
--- a/src/components/views/elements/EditableText.js
+++ b/src/components/views/elements/EditableText.js
@@ -65,7 +65,9 @@ module.exports = React.createClass({
     },
 
     componentWillReceiveProps: function(nextProps) {
-        if (nextProps.initialValue !== this.props.initialValue) {
+        if (nextProps.initialValue !== this.props.initialValue ||
+            nextProps.initialValue !== this.value
+        ) {
             this.value = nextProps.initialValue;
             if (this.refs.editable_div) {
                 this.showPlaceholder(!this.value);