2 files changed, 6 insertions, 0 deletions

diff --git a/js/mediators/element-mediator.js b/js/mediators/element-mediator.js
index e711e632..33377d72 100755
--- a/js/mediators/element-mediator.js
+++ b/js/mediators/element-mediator.js
@@ -84,6 +84,7 @@ exports.ElementMediator = Montage.create(Component, {
         value: function(newChild, oldChild, notify) {
 
             this.application.ninja.currentDocument.model.documentRoot.replaceChild(newChild, oldChild);
+            if (newChild.getAttribute) newChild.setAttribute('data-ninja-node', 'true');
 
             var undoLabel = "replace element";
 
diff --git a/js/mediators/keyboard-mediator.js b/js/mediators/keyboard-mediator.js
index d1f8e221..cce053bc 100755
--- a/js/mediators/keyboard-mediator.js
+++ b/js/mediators/keyboard-mediator.js
@@ -57,6 +57,11 @@ var Keyboard = exports.Keyboard = {
 
 exports.KeyboardMediator = Montage.create(Component, {
 
+    appModel: {
+        value: null,
+        serializable: true
+    },
+
     deserializedFromTemplate: {
         value: function() {
             this.eventManager.addEventListener("appLoaded", this, false);