diff --git a/sdk/jme3-scenecomposer/src/com/jme3/gde/scenecomposer/tools/SelectTool.java b/sdk/jme3-scenecomposer/src/com/jme3/gde/scenecomposer/tools/SelectTool.java
index 97ca48752..f70034c22 100644
--- a/sdk/jme3-scenecomposer/src/com/jme3/gde/scenecomposer/tools/SelectTool.java
+++ b/sdk/jme3-scenecomposer/src/com/jme3/gde/scenecomposer/tools/SelectTool.java
@@ -413,6 +413,14 @@ public class SelectTool extends SceneEditTool {
                 moving.sceneUndo();
                 moving = null;
                 clearState();
+            } else if (scaling != null) {
+                scaling.sceneUndo();
+                scaling = null;
+                clearState();
+            } else if (rotating != null) {
+                rotating.sceneUndo();
+                rotating = null;
+                clearState();
             }
             else if (!wasDraggingR && !wasDownR) { // wasn't dragging and was not down already
                 // pick on the spot