2 files changed, 14 insertions, 3 deletions

diff --git a/js/panels/binding/binding-item.reel/binding-item.html b/js/panels/binding/binding-item.reel/binding-item.html
index 79644a7a..95a349f8 100644
--- a/js/panels/binding/binding-item.reel/binding-item.html
+++ b/js/panels/binding/binding-item.reel/binding-item.html
@@ -14,6 +14,7 @@
                 "prototype": "js/panels/binding/binding-item.reel",
                 "properties": {
                     "element": {"#": "binding-item"},
+                    "editButton": {"@": "editButton" },
                     "directionToggleButton": {"@": "directionToggleButton" }
                 }
             },
diff --git a/js/panels/binding/binding-item.reel/binding-item.js b/js/panels/binding/binding-item.reel/binding-item.js
index 0fc06ea8..55230fc3 100644
--- a/js/panels/binding/binding-item.reel/binding-item.js
+++ b/js/panels/binding/binding-item.reel/binding-item.js
@@ -20,8 +20,10 @@ exports.BindingItem = Montage.create(Component, {
         set: function(value) {
             if(value === this._sourceObject) { return; }
 
-            this.sourceObjectLabel = value.identifier;
-            
+            if(value && value.identifier) {
+                this.sourceObjectLabel = value.identifier;
+            }
+
             this._sourceObject = value;
         }
     },
@@ -33,7 +35,9 @@ exports.BindingItem = Montage.create(Component, {
         set: function(value) {
             if(value === this._boundObject) { return; }
 
-            this.boundObjectLabel = value.identifier;
+            if(value && value.identifier) {
+                this.boundObjectLabel = value.identifier;
+            }
 
             this._boundObject = value;
         }
@@ -82,6 +86,12 @@ exports.BindingItem = Montage.create(Component, {
         }
     },
 
+    handleEditButtonAction : {
+        value: function(e) {
+            this.parentComponent.parentComponent.displayEditView();
+        }
+    },
+
     /* -------------- Component Draw Cycle -------------- */
 
     templateDidLoad : {