diff --git a/DevLog/Presentation/ViewModel/TodoEditorViewModel.swift b/DevLog/Presentation/ViewModel/TodoEditorViewModel.swift
index 05e414bf..60149c90 100644
--- a/DevLog/Presentation/ViewModel/TodoEditorViewModel.swift
+++ b/DevLog/Presentation/ViewModel/TodoEditorViewModel.swift
@@ -42,7 +42,6 @@ final class TodoEditorViewModel: Store {
         var tags: OrderedSet<String> = []
         var tagText: String = ""
         var focusOnEditor: Bool = false
-        var hasDueDate: Bool { dueDate != nil }
         var tabViewTag: Tag = .editor
         var isValidToSave: Bool {
             !title.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty
@@ -62,7 +61,6 @@ final class TodoEditorViewModel: Store {
         case setTagText(String)
         case setTitle(String)
         case togglePinned
-        case toggleDueDate
     }
 
     enum SideEffect { }
@@ -140,12 +138,6 @@ final class TodoEditorViewModel: Store {
             state.tabViewTag = tag
         case .togglePinned:
             state.isPinned.toggle()
-        case .toggleDueDate:
-            if state.hasDueDate {
-                state.dueDate = nil
-            } else {
-                state.dueDate = calendar.date(byAdding: .day, value: 1, to: Date())
-            }
         }
 
         if self.state != state { self.state = state }
diff --git a/DevLog/UI/Home/TodoEditorView.swift b/DevLog/UI/Home/TodoEditorView.swift
index 2c8b0334..f7126e38 100644
--- a/DevLog/UI/Home/TodoEditorView.swift
+++ b/DevLog/UI/Home/TodoEditorView.swift
@@ -15,6 +15,7 @@ struct TodoEditorView: View {
     @Environment(\.dismiss) private var dismiss
     @FocusState private var field: Field?
     @State private var showDueDatePicker: Bool = false
+    private let calendar = Calendar.current
     var onSubmit: ((Todo) -> Void)?
 
     var body: some View {
@@ -175,30 +176,30 @@ struct TodoEditorView: View {
                 }
                 .adaptiveButtonStyle()
             }
-            DueDatePicker(selection: Binding(
-                get: { viewModel.state.dueDate ?? Date() },
-                set: { viewModel.send(.setDueDate($0)) }
-            )) {
-                HStack {
-                    Label {
-                        Text("마감일")
-                    } icon: {
-                        Image(systemName: "calendar")
-                            .foregroundStyle(.gray)
+            dueDateControl
+        }
+    }
+
+    private var dueDateControl: some View {
+        DueDatePicker(selection: Binding(
+            get: { viewModel.state.dueDate ?? Date() },
+            set: { viewModel.send(.setDueDate($0)) }
+        )) {
+            Label {
+                if let dueDate = viewModel.state.dueDate {
+                    Tag(dueDateText(for: dueDate), isEditing: true) {
+                        viewModel.send(.setDueDate(nil))
                     }
-                    Image(systemName: "checkmark.square")
-                        .symbolRenderingMode(.palette)
-                        .foregroundStyle(
-                            viewModel.state.hasDueDate ? .blue : .clear,
-                            .gray
-                        )
-                        .onTapGesture {
-                            viewModel.send(.setDueDate(viewModel.state.hasDueDate ? nil : Date()))
-                        }
+                    .padding(.vertical, -4)
+                } else {
+                    Text("마감일")
                 }
-                .adaptiveButtonStyle()
+            } icon: {
+                Image(systemName: "calendar")
+                    .foregroundStyle(.gray)
             }
         }
+        .adaptiveButtonStyle()
     }
 
     private func submit() {
@@ -210,6 +211,21 @@ struct TodoEditorView: View {
     private enum Field: Hashable {
         case title, description, tag
     }
+
+    private func dueDateText(for dueDate: Date) -> String {
+        let currentYear = calendar.component(.year, from: Date())
+        let dueDateYear = calendar.component(.year, from: dueDate)
+
+        if currentYear == dueDateYear {
+            return dueDate.formatted(
+                .dateTime.month(.defaultDigits).day(.defaultDigits)
+            )
+        }
+
+        return dueDate.formatted(
+            .dateTime.year(.twoDigits).month(.defaultDigits).day(.defaultDigits)
+        )
+    }
 }
 
 private struct TagEditor<Content: View>: View {