diff --git a/src/containers/blocks.jsx b/src/containers/blocks.jsx
index cd3d4ff5383e60427b86bd11cf4137b93b6b5ee9..3862fa653fbe239a2db9d6e29175bcca64f508b4 100644
--- a/src/containers/blocks.jsx
+++ b/src/containers/blocks.jsx
@@ -310,6 +310,11 @@ class Blocks extends React.Component {
             this.workspace.scale = scale;
             this.workspace.resize();
         }
+
+        // Clear the undo state of the workspace since this is a
+        // fresh workspace and we don't want any changes made to another sprites
+        // workspace to be 'undone' here.
+        this.workspace.clearUndo();
     }
     handleExtensionAdded (blocksInfo) {
         // select JSON from each block info object then reject the pseudo-blocks which don't have JSON, like separators