diff --git a/scripts/system/create/edit.js b/scripts/system/create/edit.js
index 614bd5fd59..727f8ca28d 100644
--- a/scripts/system/create/edit.js
+++ b/scripts/system/create/edit.js
@@ -2656,6 +2656,24 @@ var PropertiesTool = function (opts) {
                 } else {
                     audioFeedback.rejection();
                 }
+            } else if (data.action === "setRotationToZero") {
+                if (selectionManager.selections.length === 1 && SelectionManager.hasUnlockedSelection()) {
+                    selectionManager.saveProperties();
+                    var parentState = getParentState(selectionManager.selections[0]);
+                    if ((parentState === "PARENT_CHILDREN" || parentState === "CHILDREN") && selectionDisplay.getSpaceMode() === "local" ) {
+                        Entities.editEntity(selectionManager.selections[0], {
+                            localRotation: Quat.IDENTITY
+                        });                    
+                    } else {
+                        Entities.editEntity(selectionManager.selections[0], {
+                            rotation: Quat.IDENTITY
+                        });
+                    }
+                    pushCommandForSelections();
+                    selectionManager._update(false, this);
+                } else {
+                    audioFeedback.rejection();
+                }
             }
         } else if (data.type === "propertiesPageReady") {
             updateSelections(true);