diff --git a/pkg/models/kanban_task_bucket.go b/pkg/models/kanban_task_bucket.go
index 35c623a0f..c8794201e 100644
--- a/pkg/models/kanban_task_bucket.go
+++ b/pkg/models/kanban_task_bucket.go
@@ -145,8 +145,13 @@ func updateTaskBucket(s *xorm.Session, a web.Auth, b *TaskBucket) (err error) {
 				oldTask := *task
 				oldTask.Done = false
 				updateDone(&oldTask, task)
-				updateBucket = false
-				b.BucketID = oldTaskBucket.BucketID
+				// A repeating task doesn't stay in the done bucket; route
+				// it back to the view's default bucket so the user sees
+				// the next iteration waiting in the "To-Do" column.
+				b.BucketID, err = getDefaultBucketID(s, view)
+				if err != nil {
+					return err
+				}
 			}
 		}