diff --git a/packages/client/src/stores/builder.js b/packages/client/src/stores/builder.js
index 22ee7b43b5..08ac6ba906 100644
--- a/packages/client/src/stores/builder.js
+++ b/packages/client/src/stores/builder.js
@@ -80,9 +80,15 @@ const createBuilderStore = () => {
       })
     },
     setDragging: dragging => {
+      if (dragging === get(writableStore).isDragging) {
+        return
+      }
       writableStore.update(state => ({ ...state, isDragging: dragging }))
     },
     setEditMode: enabled => {
+      if (enabled === get(writableStore).editMode) {
+        return
+      }
       writableStore.update(state => ({ ...state, editMode: enabled }))
     },
   }