diff --git a/cypress/e2e/block_images.cy.js b/cypress/e2e/block_images.cy.js
index bb377af..92f43c7 100644
--- a/cypress/e2e/block_images.cy.js
+++ b/cypress/e2e/block_images.cy.js
@@ -1,9 +1,11 @@
 describe("Block Images", () => {
   it("download all block images", () => {
     cy.visit("http://localhost:5173/")
-    cy.get("[data-id]").each(($el) => {
+    cy.get("[data-id^='block-type-']").each(($el) => {
       cy.wrap($el).rightclick({ force: true })
       cy.contains("Save Block as PNG...").click()
+    }).then(blockElements => {
+      cy.log(`Saved ${blockElements.length} block images.`)
     })
   })
 })
diff --git a/src/exporters/workspace_all_blocks_exporter.js b/src/exporters/workspace_all_blocks_exporter.js
index 819da4a..de31e18 100644
--- a/src/exporters/workspace_all_blocks_exporter.js
+++ b/src/exporters/workspace_all_blocks_exporter.js
@@ -23,6 +23,7 @@ export default class WorkspaceExporter {
           languageVersion: 0,
           blocks: allBlocks.map((block, index) => ({
             ...block,
+            id: `block-type-${block.type}`,
             x: 50,
             y: 50*index
           }))