diff --git a/Marks/Views/EditBookmarkView.swift b/Marks/Views/EditBookmarkView.swift
index 9ae6404..33430e2 100644
--- a/Marks/Views/EditBookmarkView.swift
+++ b/Marks/Views/EditBookmarkView.swift
@@ -19,7 +19,8 @@ struct EditBookmarkView: View {
         _url = State(initialValue: bookmark.url)
         _title = State(initialValue: bookmark.title)
         _description = State(initialValue: bookmark.description)
-        _tagsText = State(initialValue: bookmark.tagNames.joined(separator: ", "))
+        let effectiveTags = bookmark.tagNames.isEmpty ? (bookmark.aiTags ?? []) : bookmark.tagNames
+        _tagsText = State(initialValue: effectiveTags.joined(separator: ", "))
         _unread = State(initialValue: bookmark.unread)
     }