1 files changed, 15 insertions, 0 deletions

diff --git a/js/controllers/clipboard-controller.js b/js/controllers/clipboard-controller.js
index afc94c8c..c3543c95 100644
--- a/js/controllers/clipboard-controller.js
+++ b/js/controllers/clipboard-controller.js
@@ -87,6 +87,11 @@ var ClipboardController = exports.ClipboardController = Montage.create(Component
                 }
             }
 
+            //perform clipboard operations only if selection tool is selected
+            if(this.application.ninja.toolsData.defaultToolsData[this.application.ninja.toolsData.selectionToolIndex].selected === false){
+                return;
+            }
+
             if(this.clipboardContext === "stage"){
                 ElementsClipboardAgent.copy(clipboardEvent);
             }
@@ -106,6 +111,11 @@ var ClipboardController = exports.ClipboardController = Montage.create(Component
                 }
             }
 
+            //perform clipboard operations only if selection tool is selected
+            if(this.application.ninja.toolsData.defaultToolsData[this.application.ninja.toolsData.selectionToolIndex].selected === false){
+                return;
+            }
+
             if(this.clipboardContext === "stage"){
                 ElementsClipboardAgent.cut(clipboardEvent);
             }
@@ -132,6 +142,11 @@ var ClipboardController = exports.ClipboardController = Montage.create(Component
                 }
             }
 
+            //perform clipboard operations only if selection tool is selected
+            if(this.application.ninja.toolsData.defaultToolsData[this.application.ninja.toolsData.selectionToolIndex].selected === false){
+                return;
+            }
+
             //TODO: return if stage is not focussed
 
             if(this.clipboardContext === "stage"){