diff --git a/gtk2_ardour/route_group_dialog.cc b/gtk2_ardour/route_group_dialog.cc
index f55281f582..9221a67948 100644
--- a/gtk2_ardour/route_group_dialog.cc
+++ b/gtk2_ardour/route_group_dialog.cc
@@ -184,9 +184,9 @@ RouteGroupDialog::do_run ()
 {
 	while (1) {
 		int const r = run ();
-		if (r == Gtk::RESPONSE_CANCEL) {
-			/* cancel, so just bail now */
-			return Gtk::RESPONSE_CANCEL;
+
+		if (r != Gtk::RESPONSE_OK) {
+			return true;
 		}
 
 		if (unique_name (_name.get_text())) {