diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc
index 352b4092b5..bb22173aaa 100644
--- a/gtk2_ardour/editor.cc
+++ b/gtk2_ardour/editor.cc
@@ -3069,7 +3069,7 @@ Editor::_snap_to_bbt (timepos_t const & presnap, Temporal::RoundMode direction,
 		 * for the snap, based on the grid setting.
 		 */
 
-		int divisor;
+		float divisor;
 		switch (_grid_type) {
 			case GridTypeBeatDiv3:
 			case GridTypeBeatDiv6:
@@ -3080,12 +3080,12 @@ Editor::_snap_to_bbt (timepos_t const & presnap, Temporal::RoundMode direction,
 			case GridTypeBeatDiv5:
 			case GridTypeBeatDiv10:
 			case GridTypeBeatDiv20:
-				divisor = 5;
+				divisor = 2.5;
 				break;
 			case GridTypeBeatDiv7:
 			case GridTypeBeatDiv14:
 			case GridTypeBeatDiv28:
-				divisor = 7;
+				divisor = 3.5;
 				break;
 			case GridTypeBeat:
 				divisor = 1;
diff --git a/gtk2_ardour/editor_tempodisplay.cc b/gtk2_ardour/editor_tempodisplay.cc
index 3b1af15b3e..6ae25a3487 100644
--- a/gtk2_ardour/editor_tempodisplay.cc
+++ b/gtk2_ardour/editor_tempodisplay.cc
@@ -358,7 +358,7 @@ Editor::compute_current_bbt_points (Temporal::TempoMapPoints& grid, samplepos_t
 	const Beats lower_beat = (left < Beats() ? Beats() : left);
 	const samplecnt_t sr (_session->sample_rate());
 
-	int divisor;
+	float divisor;
 	switch (_grid_type) {
 		case GridTypeBeatDiv3:
 		case GridTypeBeatDiv6:
@@ -369,12 +369,12 @@ Editor::compute_current_bbt_points (Temporal::TempoMapPoints& grid, samplepos_t
 		case GridTypeBeatDiv5:
 		case GridTypeBeatDiv10:
 		case GridTypeBeatDiv20:
-			divisor = 5;
+			divisor = 2.5;
 			break;
 		case GridTypeBeatDiv7:
 		case GridTypeBeatDiv14:
 		case GridTypeBeatDiv28:
-			divisor = 7;
+			divisor = 3.5;
 			break;
 		default:
 			divisor = 2;