1 files changed, 3 insertions, 0 deletions

diff --git a/js/tools/ShapeTool.js b/js/tools/ShapeTool.js
index 8f45891d..d2337000 100755
--- a/js/tools/ShapeTool.js
+++ b/js/tools/ShapeTool.js
@@ -106,6 +106,9 @@ exports.ShapeTool = Montage.create(DrawingTool, {
             if(wasSelected) {
                 this.AddCustomFeedback();
                 this.application.ninja.elementMediator.addDelegate = this;
+                if(this.application.ninja.currentSelectedContainer.nodeName === "CANVAS") {
+                    this._targetedElement = this.application.ninja.currentSelectedContainer;
+                }
             } else {
                 this.RemoveCustomFeedback();
                 this.application.ninja.elementMediator.addDelegate = null;