diff --git a/core/base_grid.cpp b/core/base_grid.cpp
index 0e94b6aa2..82707e55e 100644
--- a/core/base_grid.cpp
+++ b/core/base_grid.cpp
@@ -590,8 +590,10 @@ void BaseGrid::OnMouseEvent(wxMouseEvent &event) {
 	}
 
 	// Click type
+	bool startedHolding = false;
 	if (click && !holding && validRow) {
 		holding = true;
+		startedHolding = true;
 		CaptureMouse();
 	}
 	if (!event.ButtonIsDown(wxMOUSE_BTN_LEFT) && holding) {
@@ -609,7 +611,13 @@ void BaseGrid::OnMouseEvent(wxMouseEvent &event) {
 		if (row > maxVis) delta = +1;
 
 		// Scroll
-		ScrollTo(yPos+delta*3);
+		if (delta) {
+			ScrollTo(yPos+delta*3);
+			if (startedHolding) {
+				holding = false;
+				ReleaseMouse();
+			}
+		}
 	}
 
 	// Click
diff --git a/docs/feature comparison.xls b/docs/feature comparison.xls
index 3ee7fbd89..53079b9c7 100644
Binary files a/docs/feature comparison.xls and b/docs/feature comparison.xls differ