diff --git a/src/mixins/clickAndDrop.js b/src/mixins/clickAndDrop.js
index 0ec2e391a..0fd27d4ee 100644
--- a/src/mixins/clickAndDrop.js
+++ b/src/mixins/clickAndDrop.js
@@ -86,6 +86,7 @@ export default {
       this.yOffset = event.clientY - sourceElement.getBoundingClientRect().top;
     },
     deselect() {
+      window.ProcessMaker.EventBus.$off('custom-pointerclick');
       document.removeEventListener('mousemove', this.setDraggingPosition);
       if (this.movedElement) {
         document.body.removeChild(this.movedElement);
diff --git a/tests/e2e/specs/canvasUsability/cloneImprovement/VerifyThatConfigurationsWereClonedOfFormTask.spec.js b/tests/e2e/specs/canvasUsability/cloneImprovement/VerifyThatConfigurationsWereClonedOfFormTask.spec.js
index 1b1fe5a4d..e4005584e 100644
--- a/tests/e2e/specs/canvasUsability/cloneImprovement/VerifyThatConfigurationsWereClonedOfFormTask.spec.js
+++ b/tests/e2e/specs/canvasUsability/cloneImprovement/VerifyThatConfigurationsWereClonedOfFormTask.spec.js
@@ -57,6 +57,7 @@ describe('Clone Improvement', () => {
     selectComponentType(selectorFormTask,'switch-to-manual-task');
 
     //Step 4: Clone the Manual Task
+    cy.wait(500);
     cy.get('[data-test="clone-button"]').click();
 
     //Validation 1: Verify that Manual was cloned