diff --git a/client/web/reporter/src/views/Report/Builder.vue b/client/web/reporter/src/views/Report/Builder.vue
index 62449a4e2..c2651be3e 100644
--- a/client/web/reporter/src/views/Report/Builder.vue
+++ b/client/web/reporter/src/views/Report/Builder.vue
@@ -144,9 +144,9 @@
     </grid>
 
     <b-modal
-      v-model="blocks.showConfigurator"
       :title="$t('builder:block.configuration')"
       :ok-title="$t('builder:save-button')"
+      :visible="showEditor"
       ok-variant="primary"
       cancel-variant="link"
       scrollable
@@ -154,7 +154,8 @@
       body-class="p-0 border-top-0"
       header-class="border-bottom-0"
       no-fade
-      @ok="updateBlock()"
+      @hide="hideEditorModal"
+      @ok="updateEditorBlock()"
     >
       <b-tabs
         v-if="currentBlock"
@@ -208,7 +209,7 @@
             :current-index="displayElements.currentIndex"
             draggable
             @select="setCurrentDisplayElement"
-            @add="openDisplayElementSelector(blocks.currentIndex)"
+            @add="openDisplayElementSelector(editor.currentIndex)"
             @delete="deleteCurrentDisplayElement"
           >
             <template #label="{ item: { kind, name } }">
@@ -511,6 +512,8 @@ export default {
 
         selected: undefined,
       },
+
+      editor: undefined,
     }
   },
 
@@ -574,12 +577,12 @@ export default {
 
     currentBlock: {
       get () {
-        return this.blocks.currentIndex !== undefined ? this.reportBlocks[this.blocks.currentIndex] : undefined
+        return this.editor ? this.editor.block : undefined
       },
 
       set (block) {
-        if (this.blocks.currentIndex !== undefined) {
-          this.reportBlocks[this.blocks.currentIndex] = block
+        if (this.editor && this.editor.currentIndex !== undefined) {
+          this.editor.block = block
         }
       },
     },
@@ -650,6 +653,10 @@ export default {
 
       return this.datasources.processing || hasDuplicates
     },
+
+    showEditor () {
+      return this.editor && this.editor.currentIndex !== undefined
+    },
   },
 
   watch: {
@@ -883,10 +890,29 @@ export default {
       }
     },
 
+    updateEditorBlock (block = this.editor.block) {
+      const { currentIndex } = this.editor
+      this.reportBlocks[currentIndex] = block
+      this.editor = undefined
+      this.onBlockUpdated(currentIndex)
+      this.refreshReport()
+    },
+
     editBlock (index = undefined) {
-      this.blocks.currentIndex = index
-      this.setCurrentDisplayElement(this.reportBlocks[this.blocks.currentIndex].elements.length ? 0 : undefined)
-      this.blocks.showConfigurator = true
+      const { x, y, w, h, i } = this.reportBlocks[index]
+      const block = new reporter.Block(this.reportBlocks[index])
+
+      block.x = x
+      block.y = y
+      block.w = w
+      block.h = h
+      block.i = i
+
+      this.editor = {
+        currentIndex: index,
+        block,
+      }
+      this.setCurrentDisplayElement(this.editor.block.elements.length ? 0 : undefined)
     },
 
     deleteBlock (index = undefined) {
@@ -894,6 +920,11 @@ export default {
       this.unsavedBlocks.add(index)
     },
 
+    hideEditorModal () {
+      this.editor = undefined
+      this.displayElements.currentIndex = undefined
+    },
+
     // Display elements
     openDisplayElementSelector (index) {
       this.blocks.currentIndex = index