diff --git a/gtk2_ardour/time_axis_view.cc b/gtk2_ardour/time_axis_view.cc
index 56f23a0ac2..98f801ae72 100644
--- a/gtk2_ardour/time_axis_view.cc
+++ b/gtk2_ardour/time_axis_view.cc
@@ -449,7 +449,10 @@ TimeAxisView::name_entry_key_release (GdkEventKey* ev)
 			} else {
 				if (i != allviews->begin()) {
 					do {
-						if (--i == allviews->begin()) { return true; }
+						if (i == allviews->begin()) {
+							return true;
+						}
+						--i;
 					} while ((*i)->hidden());
 				}
 			}