diff --git a/gtk2_ardour/midi_region_view.cc b/gtk2_ardour/midi_region_view.cc
index ef04fde798..97cb11529e 100644
--- a/gtk2_ardour/midi_region_view.cc
+++ b/gtk2_ardour/midi_region_view.cc
@@ -3257,7 +3257,8 @@ MidiRegionView::get_fill_color() const
 	                              "midi frame base");
 	if (_selected) {
 		return ARDOUR_UI::config()->color_mod ("selected region base", mod_name);
-	} else if (high_enough_for_name || !ARDOUR_UI::config()->get_color_regions_using_track_color()) {
+	} else if ((!ARDOUR_UI::config()->get_show_name_highlight() || high_enough_for_name) &&
+	           !ARDOUR_UI::config()->get_color_regions_using_track_color()) {
 		return ARDOUR_UI::config()->color_mod ("midi frame base", mod_name);
 	}
 	return ARDOUR_UI::config()->color_mod (fill_color, mod_name);
diff --git a/gtk2_ardour/time_axis_view_item.cc b/gtk2_ardour/time_axis_view_item.cc
index e6053906e0..5b6a63f279 100644
--- a/gtk2_ardour/time_axis_view_item.cc
+++ b/gtk2_ardour/time_axis_view_item.cc
@@ -694,27 +694,17 @@ TimeAxisViewItem::set_name_text_color ()
 ArdourCanvas::Color
 TimeAxisViewItem::get_fill_color () const
 {
-	ArdourCanvas::Color c;
 	const std::string mod_name = (_dragging ? "dragging region" : fill_color_name);
 
 	if (_selected) {
-
-		c = ARDOUR_UI::config()->color_mod ("selected region base", mod_name);
-
-	} else {
-
-		if (_recregion) {
-			c = ARDOUR_UI::config()->color ("recording rect");
-		} else {
-			if ((!ARDOUR_UI::config()->get_show_name_highlight() || high_enough_for_name) && !ARDOUR_UI::config()->get_color_regions_using_track_color()) {
-				c = ARDOUR_UI::config()->color_mod (fill_color_name, mod_name);
-			} else {
-				c = ARDOUR_UI::config()->color_mod (fill_color, mod_name);
-			}
-		}
+		return ARDOUR_UI::config()->color_mod ("selected region base", mod_name);
+	} else if (_recregion) {
+		return ARDOUR_UI::config()->color ("recording rect");
+	} else if ((!ARDOUR_UI::config()->get_show_name_highlight() || high_enough_for_name) &&
+	           !ARDOUR_UI::config()->get_color_regions_using_track_color()) {
+		return ARDOUR_UI::config()->color_mod (fill_color_name, mod_name);
 	}
-
-	return c;
+	return ARDOUR_UI::config()->color_mod (fill_color, mod_name);
 }
 
 /**