diff --git a/Application/DevLogApp/Sources/Resource/Localizable.xcstrings b/Application/DevLogApp/Sources/Resource/Localizable.xcstrings
index 6469af01..fc0aec2c 100644
--- a/Application/DevLogApp/Sources/Resource/Localizable.xcstrings
+++ b/Application/DevLogApp/Sources/Resource/Localizable.xcstrings
@@ -2689,6 +2689,23 @@
         }
       }
     },
+    "todo_write" : {
+      "extractionState" : "manual",
+      "localizations" : {
+        "en" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Write"
+          }
+        },
+        "ko" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "작성"
+          }
+        }
+      }
+    },
     "todo_editor_description_optional" : {
       "extractionState" : "manual",
       "localizations" : {
diff --git a/Application/DevLogPresentation/Sources/Home/TodoEditorView.swift b/Application/DevLogPresentation/Sources/Home/TodoEditorView.swift
index 9d0d126e..b7b1e4fa 100644
--- a/Application/DevLogPresentation/Sources/Home/TodoEditorView.swift
+++ b/Application/DevLogPresentation/Sources/Home/TodoEditorView.swift
@@ -106,32 +106,27 @@ struct TodoEditorView: View {
     }
 
     private var tabViewSelector: some View {
-        VStack(spacing: 0) {
-            HStack(spacing: 0) {
-                Button(action: {
-                    viewModel.send(.setTabViewTag(.editor))
-                    field = .content
-                }) {
-                    Text(String(localized: "todo_edit"))
-                        .frame(maxWidth: .infinity)
-                        .foregroundStyle(
-                            viewModel.state.tabViewTag == .editor ? Color.primary : Color.secondary
-                        )
-                }
-                Divider()
-                Button(action: {
-                    transitionToPreview()
-                }) {
-                    Text(String(localized: "todo_preview"))
-                        .frame(maxWidth: .infinity)
-                        .foregroundStyle(
-                            viewModel.state.tabViewTag == .preview ? Color.primary : Color.gray
-                        )
+        Picker(
+            "",
+            selection: Binding(
+                get: { viewModel.state.tabViewTag },
+                set: { tag in
+                    if tag == .editor {
+                        viewModel.send(.setTabViewTag(.editor))
+                        field = .content
+                    } else {
+                        transitionToPreview()
+                    }
                 }
-            }
-            .padding(.vertical, 10)
-            .background(Color(.systemBackground))
+            )
+        ) {
+            Text(String(localized: "todo_write"))
+                .tag(TodoEditorViewModel.Tag.editor)
+            Text(String(localized: "todo_preview"))
+                .tag(TodoEditorViewModel.Tag.preview)
         }
+        .pickerStyle(.segmented)
+        .padding(.horizontal)
     }
 
     private var tabView: some View {