diff --git a/src/containers/target-pane.jsx b/src/containers/target-pane.jsx
index b5af39b16ddfaa6d66597c4ea7ce79e96009ad96..0f238587f372496c8e054c85c25d751a2bed6d31 100644
--- a/src/containers/target-pane.jsx
+++ b/src/containers/target-pane.jsx
@@ -191,7 +191,7 @@ class TargetPane extends React.Component {
             topBlock.y = posY / scale;
         }
 
-        this.props.vm.shareBlocksToTarget(blocks, targetId, optFromTargetId);
+        return this.props.vm.shareBlocksToTarget(blocks, targetId, optFromTargetId);
     }
     handleDrop (dragInfo) {
         const {sprite: targetId} = this.props.hoveredTarget;
@@ -228,10 +228,8 @@ class TargetPane extends React.Component {
                 }, targetId);
             } else if (dragInfo.dragType === DragConstants.BACKPACK_CODE) {
                 fetchCode(dragInfo.payload.bodyUrl)
-                    .then(blocks => {
-                        this.shareBlocks(blocks, targetId);
-                        this.props.vm.refreshWorkspace();
-                    });
+                    .then(blocks => this.shareBlocks(blocks, targetId))
+                    .then(() => this.props.vm.refreshWorkspace());            
             }
         }
     }