diff --git a/LibationWinForms/GridEntry.cs b/LibationWinForms/GridEntry.cs
index 1ddb77e9..5113d10f 100644
--- a/LibationWinForms/GridEntry.cs
+++ b/LibationWinForms/GridEntry.cs
@@ -23,10 +23,6 @@ namespace LibationWinForms
         [Browsable(false)]
 		public string AudibleProductId => Book.AudibleProductId;
 		[Browsable(false)]
-		public string Tags => Book.UserDefinedItem.Tags;
-		[Browsable(false)]
-		public IEnumerable<string> TagsEnumerated => Book.UserDefinedItem.TagsEnumerated;
-		[Browsable(false)]
 		public LibraryBook LibraryBook { get; }
 
 		#endregion
@@ -114,7 +110,7 @@ namespace LibationWinForms
 		public string Misc { get; }
 		public string Description { get; }
 
-		public string DisplayTags => string.Join("\r\n", TagsEnumerated);
+		public string DisplayTags => string.Join("\r\n", Book.UserDefinedItem.TagsEnumerated);
 		public (LiberatedState, PdfState) Liberate => (LibraryCommands.Liberated_Status(Book), LibraryCommands.Pdf_Status(Book));
 
 		#endregion
diff --git a/LibationWinForms/ProductsGrid.cs b/LibationWinForms/ProductsGrid.cs
index 5879ac9c..5b97bbff 100644
--- a/LibationWinForms/ProductsGrid.cs
+++ b/LibationWinForms/ProductsGrid.cs
@@ -80,7 +80,7 @@ namespace LibationWinForms
 
         private void EditTags_Click(GridEntry liveGridEntry)
         {
-            var bookDetailsForm = new BookDetailsDialog(liveGridEntry.Title, liveGridEntry.Tags);
+            var bookDetailsForm = new BookDetailsDialog(liveGridEntry.Title, liveGridEntry.LibraryBook.Book.UserDefinedItem.Tags);
             if (bookDetailsForm.ShowDialog() != DialogResult.OK)
                 return;