diff --git a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/componentTree/TreeDropListener.java b/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/componentTree/TreeDropListener.java
index c9d39d65916b..8846772dcc73 100644
--- a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/componentTree/TreeDropListener.java
+++ b/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/componentTree/TreeDropListener.java
@@ -15,7 +15,6 @@
  */
 package com.intellij.designer.componentTree;
 
-import com.intellij.designer.DesignerBundle;
 import com.intellij.designer.clipboard.SimpleTransferable;
 import com.intellij.designer.designSurface.ComponentTargetFilter;
 import com.intellij.designer.designSurface.EditOperation;
@@ -256,8 +255,7 @@ public class TreeDropListener extends DropTargetAdapter {
 
   private void executeCommand() {
     if (myExecuteEnabled) {
-      myToolProvider.execute(Collections.singletonList(myTargetOperation),
-                             DesignerBundle.message("command.tool_operation", myContext.getType()));
+      myToolProvider.execute(Collections.singletonList(myTargetOperation), myContext.getMessage());
       if (myContext.isCreate()) {
         myArea.setSelection(myContext.getComponents());
       }
diff --git a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/designSurface/OperationContext.java b/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/designSurface/OperationContext.java
index a886e38d9558..ac4215fc7505 100644
--- a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/designSurface/OperationContext.java
+++ b/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/designSurface/OperationContext.java
@@ -15,6 +15,7 @@
  */
 package com.intellij.designer.designSurface;
 
+import com.intellij.designer.DesignerBundle;
 import com.intellij.designer.model.RadComponent;
 import org.jetbrains.annotations.Nullable;
 
@@ -58,6 +59,10 @@ public final class OperationContext {
     myType = type;
   }
 
+  public String getMessage() {
+    return DesignerBundle.message(myType == null ? "command.tool_operation" : myType.toString());
+  }
+
   public boolean is(Object type) {
     if (myType == type) {
       return true;
diff --git a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/designSurface/tools/ResizeTracker.java b/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/designSurface/tools/ResizeTracker.java
index c09ffadda1b2..7317bbdc6fde 100644
--- a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/designSurface/tools/ResizeTracker.java
+++ b/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/designSurface/tools/ResizeTracker.java
@@ -134,7 +134,7 @@ public class ResizeTracker extends InputTool {
           operations.add(operation);
         }
       }
-      myToolProvider.execute(operations, DesignerBundle.message("command.tool_operation", myContext.getType()));
+      myToolProvider.execute(operations, DesignerBundle.message("command.tool_operation"));
     }
   }
 
diff --git a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/designSurface/tools/TargetingTool.java b/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/designSurface/tools/TargetingTool.java
index dc6e8c870250..0da30a8a9bb3 100644
--- a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/designSurface/tools/TargetingTool.java
+++ b/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/designSurface/tools/TargetingTool.java
@@ -79,8 +79,7 @@ public abstract class TargetingTool extends InputTool {
 
   protected void executeCommand() {
     if (myExecuteEnabled) {
-      myToolProvider
-        .execute(Collections.singletonList(myTargetOperation), DesignerBundle.message("command.tool_operation", myContext.getType()));
+      myToolProvider.execute(Collections.singletonList(myTargetOperation), myContext.getMessage());
     }
   }
 
diff --git a/plugins/ui-designer/ui-designer-new/src/messages/DesignerBundle.properties b/plugins/ui-designer/ui-designer-new/src/messages/DesignerBundle.properties
index a1c32a1a728a..0d8570462e06 100644
--- a/plugins/ui-designer/ui-designer-new/src/messages/DesignerBundle.properties
+++ b/plugins/ui-designer/ui-designer-new/src/messages/DesignerBundle.properties
@@ -1,7 +1,11 @@
 designer.toolwindow.name=Designer
 designer.toolwindow.title=Component Tree
 
-command.tool_operation=Visual edit operation: {0}
+move_children=Move Component
+add_children=Move Component
+create_children=Insert Component
+paste_children=Paste
+command.tool_operation=Visual Edit Operation
 command.delete.selection=Delete Selection
 command.set.property.value=Set Property Value