diff --git a/src/LinkDotNet.Blog.Domain/BlogPost.cs b/src/LinkDotNet.Blog.Domain/BlogPost.cs
index 94c80043..9dbfd07e 100644
--- a/src/LinkDotNet.Blog.Domain/BlogPost.cs
+++ b/src/LinkDotNet.Blog.Domain/BlogPost.cs
@@ -32,6 +32,8 @@ private BlogPost()
public bool IsScheduled => ScheduledPublishDate is not null;
+ public string TagsAsString => Tags is null ? string.Empty : string.Join(", ", Tags.Select(t => t.Content));
+
public static BlogPost Create(
string title,
string shortDescription,
diff --git a/src/LinkDotNet.Blog.Web/Features/Admin/BlogPostEditor/Components/CreateNewModel.cs b/src/LinkDotNet.Blog.Web/Features/Admin/BlogPostEditor/Components/CreateNewModel.cs
index 76264c7a..3f6922f7 100644
--- a/src/LinkDotNet.Blog.Web/Features/Admin/BlogPostEditor/Components/CreateNewModel.cs
+++ b/src/LinkDotNet.Blog.Web/Features/Admin/BlogPostEditor/Components/CreateNewModel.cs
@@ -93,7 +93,7 @@ public static CreateNewModel FromBlogPost(BlogPost blogPost)
{
id = blogPost.Id,
Content = blogPost.Content,
- Tags = blogPost.Tags != null ? string.Join(",", blogPost.Tags.Select(t => t.Content)) : null,
+ Tags = blogPost.TagsAsString,
Title = blogPost.Title,
ShortDescription = blogPost.ShortDescription,
IsPublished = blogPost.IsPublished,
diff --git a/src/LinkDotNet.Blog.Web/Features/ShowBlogPost/ShowBlogPostPage.razor b/src/LinkDotNet.Blog.Web/Features/ShowBlogPost/ShowBlogPostPage.razor
index 7e5b7f9c..e0dbe439 100644
--- a/src/LinkDotNet.Blog.Web/Features/ShowBlogPost/ShowBlogPostPage.razor
+++ b/src/LinkDotNet.Blog.Web/Features/ShowBlogPost/ShowBlogPostPage.razor
@@ -19,7 +19,7 @@ else