diff --git a/aegisub/src/base_grid.cpp b/aegisub/src/base_grid.cpp
index 65a16a4fc..cc0ebd8fb 100644
--- a/aegisub/src/base_grid.cpp
+++ b/aegisub/src/base_grid.cpp
@@ -1172,8 +1172,9 @@ void BaseGrid::OnKeyPress(wxKeyEvent &event) {
 
 	// Select all
 	if (key == 'A' && ctrl && !alt && !shift) {
-		int rows = GetRows();
-		for (int i=0;i<rows;i++) SelectRow(i,true);
+		Selection sel;
+		std::copy(index_line_map.begin(), index_line_map.end(), std::inserter(sel, sel.end()));
+		SetSelectedSet(sel);
 	}
 
 	// Up/down