diff --git a/LibationWinForms/Dialogs/RemoveBooksDialog.cs b/LibationWinForms/Dialogs/RemoveBooksDialog.cs
index 7496df2b..faa829fc 100644
--- a/LibationWinForms/Dialogs/RemoveBooksDialog.cs
+++ b/LibationWinForms/Dialogs/RemoveBooksDialog.cs
@@ -30,7 +30,8 @@ namespace LibationWinForms.Dialogs
 			InitializeComponent();
 			_labelFormat = label1.Text;
 
-			_dataGridView.CellContentClick += (s, e) => _dataGridView.CommitEdit(DataGridViewDataErrorContexts.Commit);
+			_dataGridView.CellContentClick += (_, _) => _dataGridView.CommitEdit(DataGridViewDataErrorContexts.Commit);
+			_dataGridView.CellValueChanged += (_, _) => UpdateSelection();
 			_dataGridView.BindingContextChanged += _dataGridView_BindingContextChanged;
 
 			var orderedGridEntries = _libraryBooks
diff --git a/LibationWinForms/Form1.cs b/LibationWinForms/Form1.cs
index b17befb9..1430cee3 100644
--- a/LibationWinForms/Form1.cs
+++ b/LibationWinForms/Form1.cs
@@ -134,7 +134,7 @@ namespace LibationWinForms
 			// suppressed filter while init'ing UI
 			var prev_isProcessingGridSelect = isProcessingGridSelect;
 			isProcessingGridSelect = true;
-			setGrid();
+			this.UIThread(() => setGrid());
 			isProcessingGridSelect = prev_isProcessingGridSelect;
 
 			// UI init complete. now we can apply filter
@@ -151,7 +151,7 @@ namespace LibationWinForms
 			{
 				if (currProductsGrid != null)
 				{
-					gridPanel.UIThread(() => gridPanel.Controls.Remove(currProductsGrid));
+					gridPanel.Controls.Remove(currProductsGrid);
 					currProductsGrid.VisibleCountChanged -= setVisibleCount;
 					currProductsGrid.Dispose();
 				}