diff --git a/aegisub/src/base_grid.cpp b/aegisub/src/base_grid.cpp
index ceb4c3ae3..745fef4c4 100644
--- a/aegisub/src/base_grid.cpp
+++ b/aegisub/src/base_grid.cpp
@@ -238,7 +238,9 @@ void BaseGrid::SelectRow(int row, bool addToSelected, bool select) {
 	if (!addToSelected) {
 		Selection old_selection(selection);
 		selection.clear();
-		selection.insert(line);
+		if (select) {
+			selection.insert(line);
+		}
 		AnnounceSelectedSetChanged(selection, old_selection);
 	}
 
diff --git a/aegisub/src/visual_tool.cpp b/aegisub/src/visual_tool.cpp
index 4f5e840d0..c5dbbc1b9 100644
--- a/aegisub/src/visual_tool.cpp
+++ b/aegisub/src/visual_tool.cpp
@@ -382,7 +382,8 @@ wxArrayInt VisualTool<FeatureType>::GetSelection() {
 template<class FeatureType>
 void VisualTool<FeatureType>::ClearSelection(bool hard) {
 	if (hard) {
-		VideoContext::Get()->grid->SelectRow(0, false, false);
+		Selection sel;
+		VideoContext::Get()->grid->SetSelectedSet(sel);
 	}
 	selFeatures.clear();
 	lineSelCount.clear();