diff --git a/mapeditor.cpp b/mapeditor.cpp
index a9e387aa..8c42f782 100644
--- a/mapeditor.cpp
+++ b/mapeditor.cpp
@@ -3205,7 +3205,7 @@ EX namespace mapeditor {
         }
       }
   
-    if(cmode & sm::DRAW) {
+    if(cmode & sm::DRAW && !drawing_tool) {
 
       if(c == drawcell && EDITING_TRIANGLES && mapeditor::editingShape(group, id)) {
         if(!us) return false;