diff --git a/core/inject.js b/core/inject.js
index 8ecd1e1f7..4492bae58 100644
--- a/core/inject.js
+++ b/core/inject.js
@@ -294,6 +294,7 @@ Blockly.createMainWorkspace_ = function(svg, options, blockDragSurface,
             case Blockly.Events.BLOCK_CREATE:
             case Blockly.Events.BLOCK_MOVE:
               var object = mainWorkspace.getBlockById(e.blockId);
+              object = object.getRootBlock();
               break;
             case Blockly.Events.COMMENT_CREATE:
             case Blockly.Events.COMMENT_MOVE: