diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc
index 8a5a1db1ab..e5218c9d76 100644
--- a/gtk2_ardour/editor.cc
+++ b/gtk2_ardour/editor.cc
@@ -2917,12 +2917,18 @@ Editor::snap_to_marker (samplepos_t presnap, RoundMode direction)
 		test = after;
 	} else if (after == max_samplepos) {
 		test = before;
-	} else  {
-		if ((direction == RoundUpMaybe || direction == RoundUpAlways)) {
+	} else {
+		switch (direction) {
+		case RoundUpAlways:
+		case RoundUpMaybe:
 			test = after;
-		} else if ((direction == RoundDownMaybe || direction == RoundDownAlways)) {
+			break;
+		case RoundDownMaybe:
+		case RoundDownAlways:
 			test = before;
-		} else if (direction ==  0) {
+			break;
+		case RoundNearest:
+		default:
 			if ((presnap - before) < (after - presnap)) {
 				test = before;
 			} else {