diff --git a/src/tracks/ui/CommonTrackView.cpp b/src/tracks/ui/CommonTrackView.cpp
index e39b13876..e1ee799f8 100644
--- a/src/tracks/ui/CommonTrackView.cpp
+++ b/src/tracks/ui/CommonTrackView.cpp
@@ -85,6 +85,8 @@ std::vector<UIHandlePtr> CommonTrackView::HitTest
 static void DrawTrackName(
    TrackPanelDrawingContext &context, const Track * t, const wxRect & rect )
 {
+   if( !TrackArtist::Get( context )->mbShowTrackNameInTrack )
+      return;
    auto name = t->GetName();
    if( name.IsEmpty())
       return;