diff --git a/frontend/src/components/input/Multiselect.vue b/frontend/src/components/input/Multiselect.vue
index 34a52f001..2cbc43bd0 100644
--- a/frontend/src/components/input/Multiselect.vue
+++ b/frontend/src/components/input/Multiselect.vue
@@ -40,11 +40,11 @@
 				</slot>
 				
 				<input
+					:id="id"
 					ref="searchInput"
 					v-model="query"
 					type="text"
 					class="input"
-					:id="id"
 					:name="name"
 					:placeholder="placeholder"
 					:autocomplete="autocompleteEnabled ? undefined : 'off'"
diff --git a/frontend/src/components/project/views/ProjectKanban.vue b/frontend/src/components/project/views/ProjectKanban.vue
index a983adb8a..8249b3319 100644
--- a/frontend/src/components/project/views/ProjectKanban.vue
+++ b/frontend/src/components/project/views/ProjectKanban.vue
@@ -71,7 +71,6 @@
 										trigger-icon="ellipsis-v"
 										@close="() => showSetLimitInput = false"
 									>
-
 										<div
 											v-if="showSetLimitInput"
 											class="field has-addons"
@@ -523,6 +522,11 @@ async function updateTaskPosition(e) {
 				projectId: project.value.id,
 			}))
 			newTask.done = updatedTaskBucket.taskDone
+			if (updatedTaskBucket.bucketId !== newTask.bucketId) {
+				kanbanStore.removeTaskInBucket(newTask)
+				newTask.bucketId = updatedTaskBucket.bucketId
+				kanbanStore.addTaskToBucket(newTask)
+			}
 			kanbanStore.setTaskInBucket(newTask)
 		}
 
diff --git a/pkg/models/kanban_task_bucket.go b/pkg/models/kanban_task_bucket.go
index 975034683..7c873f274 100644
--- a/pkg/models/kanban_task_bucket.go
+++ b/pkg/models/kanban_task_bucket.go
@@ -116,11 +116,12 @@ func (b *TaskBucket) Update(s *xorm.Session, a web.Auth) (err error) {
 	if view.DoneBucketID == b.BucketID {
 		doneChanged = true
 		task.Done = true
-		if task.RepeatAfter > 0 {
+		if task.isRepeating() {
 			oldTask := task
 			task.Done = false
 			updateDone(&oldTask, &task)
 			updateBucket = false
+			b.BucketID = oldTaskBucket.BucketID
 		}
 	}
 
@@ -146,7 +147,6 @@ func (b *TaskBucket) Update(s *xorm.Session, a web.Auth) (err error) {
 		if err != nil {
 			return err
 		}
-
 	}
 
 	if updateBucket {