diff --git a/website/client/components/tasks/task.vue b/website/client/components/tasks/task.vue
index 73993353f4..6e5dbe8115 100644
--- a/website/client/components/tasks/task.vue
+++ b/website/client/components/tasks/task.vue
@@ -1,6 +1,6 @@
 <template lang="pug">
 .task-wrapper
-  .task
+  .task(@click='castEnd($event, task)')
     approval-header(:task='task', v-if='this.task.group.id', :group='group')
     .d-flex(:class="{'task-not-scoreable': isUser !== true}")
       // Habits left side control
@@ -690,8 +690,6 @@ export default {
 
       if (!this.$store.state.spellOptions.castingSpell) {
         this.$emit('editTask', task);
-      } else {
-        this.$root.$emit('castEnd', task, 'task', e);
       }
     },
     moveToTop () {
@@ -705,6 +703,9 @@ export default {
       this.destroyTask(this.task);
       this.$emit('taskDestroyed', this.task);
     },
+    castEnd (e, task) {
+      setTimeout(() => this.$root.$emit('castEnd', task, 'task', e), 0);
+    },
     async score (direction) {
       if (this.castingSpell) return;