diff --git a/apps/timo-web/app/[locale]/(main)/(with-time-sidebar)/today/_components/TodayTodoCard.tsx b/apps/timo-web/app/[locale]/(main)/(with-time-sidebar)/today/_components/TodayTodoCard.tsx
index 381cd1b3..3b486a6a 100644
--- a/apps/timo-web/app/[locale]/(main)/(with-time-sidebar)/today/_components/TodayTodoCard.tsx
+++ b/apps/timo-web/app/[locale]/(main)/(with-time-sidebar)/today/_components/TodayTodoCard.tsx
@@ -183,7 +183,7 @@ export const TodayTodoCard = ({
             tagLabel={toolbar.tag ?? "태그"}
             tags={[]}
             selectedTag={toolbar.tag}
-            hasMemo={toolbar.hasSubtask}
+            hasSubTask={toolbar.hasSubtask}
             isRepeatActive={toolbar.hasRepeat}
             repeat={{
               detailHeading: "상세 설정",
diff --git a/apps/timo-web/components/todo-modal/create/CreateTodoModalContent.tsx b/apps/timo-web/components/todo-modal/create/CreateTodoModalContent.tsx
index 2af5b173..c0704ada 100644
--- a/apps/timo-web/components/todo-modal/create/CreateTodoModalContent.tsx
+++ b/apps/timo-web/components/todo-modal/create/CreateTodoModalContent.tsx
@@ -178,7 +178,9 @@ export const CreateTodoModalContent = ({
             addTagLabel={t("createModal.addTag")}
             onSelectTag={tagField.handleSelectTag}
             onAddTagClick={tagField.handleAddTagClick}
-            hasMemo={Boolean(memoField.value?.trim())}
+            hasSubTask={subtaskField.subtaskInputs.some(
+              (entry) => entry.value.trim().length > 0,
+            )}
             isRepeatActive={repeatField.isRepeatActive}
             repeat={{
               detailHeading: t("createModal.repeatDetailHeading"),
diff --git a/apps/timo-web/components/todo-modal/detail/DetailTodoModalContent.tsx b/apps/timo-web/components/todo-modal/detail/DetailTodoModalContent.tsx
index e834191a..a7ff4c25 100644
--- a/apps/timo-web/components/todo-modal/detail/DetailTodoModalContent.tsx
+++ b/apps/timo-web/components/todo-modal/detail/DetailTodoModalContent.tsx
@@ -215,7 +215,9 @@ export const DetailTodoModalContent = ({
                   addTagLabel={tCreateModal("addTag")}
                   onSelectTag={patchHandlers.handleSelectTag}
                   onAddTagClick={detailTodoForm.handleAddTagClick}
-                  hasMemo={Boolean(todo.memo?.trim())}
+                  hasSubTask={detailTodoForm.subtaskInputs.some(
+                    (input) => input.value.trim().length > 0,
+                  )}
                   isRepeatActive={detailTodoForm.isRepeatActive}
                   repeat={{
                     frequencyHeading: t("repeatFrequencyHeading"),
diff --git a/apps/timo-web/providers/dnd/DndSortableListProvider.tsx b/apps/timo-web/providers/dnd/DndSortableListProvider.tsx
index 469407f8..0a07e299 100644
--- a/apps/timo-web/providers/dnd/DndSortableListProvider.tsx
+++ b/apps/timo-web/providers/dnd/DndSortableListProvider.tsx
@@ -59,6 +59,7 @@ export const DndSortableListProvider = ({
       sensors={sensors}
       collisionDetection={closestCenter}
       modifiers={[restrictToVerticalAxis]}
+      autoScroll={{ threshold: { x: 0, y: 0.2 } }}
       onDragEnd={handleDragEnd}
     >
       <SortableContext items={itemIds} strategy={verticalListSortingStrategy}>
diff --git a/packages/timo-design-system/src/components/todo/todo-toolbar/TodoToolbar.tsx b/packages/timo-design-system/src/components/todo/todo-toolbar/TodoToolbar.tsx
index 13028893..aca007af 100644
--- a/packages/timo-design-system/src/components/todo/todo-toolbar/TodoToolbar.tsx
+++ b/packages/timo-design-system/src/components/todo/todo-toolbar/TodoToolbar.tsx
@@ -56,7 +56,7 @@ export interface TodoToolbarProps {
   onSelectTag?: (tag: string) => void;
   onAddTagClick?: () => void;
 
-  hasMemo?: boolean;
+  hasSubTask?: boolean;
 
   isRepeatActive?: boolean;
   repeat: Omit<RepeatSelectorProps, "trigger">;
@@ -86,7 +86,7 @@ export const TodoToolbar = ({
   addTagLabel,
   onSelectTag,
   onAddTagClick,
-  hasMemo = false,
+  hasSubTask = false,
   isRepeatActive = false,
   repeat,
   className,
@@ -171,7 +171,7 @@ export const TodoToolbar = ({
         onAddClick={onAddTagClick}
       />
 
-      {hasMemo ? <MemoOnIcon /> : <MemoDisableIcon />}
+      {hasSubTask ? <MemoOnIcon /> : <MemoDisableIcon />}
 
       <RepeatSelector
         {...repeat}