2 files changed, 14 insertions, 2 deletions

diff --git a/js/mediators/element-mediator.js b/js/mediators/element-mediator.js
index 95aec2a3..6088aeab 100755
--- a/js/mediators/element-mediator.js
+++ b/js/mediators/element-mediator.js
@@ -101,7 +101,10 @@ exports.ElementMediator = Montage.create(NJComponent, {
             {
                 el.elementModel.controller["set3DProperties"](el, [p3d], 0, true);
             }
-            if(!noEvent) NJevent("elementAdded", el);
+            if(!noEvent) {
+                this.application.ninja.documentController.activeDocument.markEdited();
+                NJevent("elementAdded", el);
+            }
         }
     },
 
@@ -127,6 +130,7 @@ exports.ElementMediator = Montage.create(NJComponent, {
     _removeElement: {
         value: function(el, rules) {
             ElementController.removeElement(el, rules);
+            this.application.ninja.documentController.activeDocument.markEdited();
             NJevent("elementDeleted", el);
         }
     },
diff --git a/js/mediators/keyboard-mediator.js b/js/mediators/keyboard-mediator.js
index e8a11ad8..40b26582 100755
--- a/js/mediators/keyboard-mediator.js
+++ b/js/mediators/keyboard-mediator.js
@@ -85,7 +85,8 @@ exports.KeyboardMediator = Montage.create(Component, {
 
     handleKeydown: {
         value: function(evt) {
-            if(document.activeElement.nodeName !== "BODY") {
+            if((document.activeElement.nodeName !== "BODY") && (!!this.application.ninja.documentController.activeDocument)
+                && (this.application.ninja.documentController.activeDocument.currentView === "design")) {
                 // Don't do anything if an input or other control is focused
                 return;
             }
@@ -110,6 +111,13 @@ exports.KeyboardMediator = Montage.create(Component, {
                 return;
             }
 
+            // Check if cmd+s/ctrl+s for Save (Windows/Mac)
+            if ((evt.keyCode == Keyboard.S) && (evt.ctrlKey || evt.metaKey) && !evt.shiftKey) {
+                NJevent("executeSave");
+                evt.preventDefault();
+                return;
+            }
+
             // Check if cmd+shift+z for Redo (Mac)
             if ((evt.keyCode == Keyboard.Z) && evt.metaKey && evt.shiftKey) {
                 NJevent("executeRedo");