diff --git a/src/MixerBoard.cpp b/src/MixerBoard.cpp
index 121ddbfab..d9b4f6383 100644
--- a/src/MixerBoard.cpp
+++ b/src/MixerBoard.cpp
@@ -461,6 +461,7 @@ void MixerTrackCluster::UpdateName()
    const wxString newName = mTrack->GetName();
    SetName(newName);
    mStaticText_TrackName->SetLabel(newName);
+   mStaticText_TrackName->SetName(newName);
    #if wxUSE_TOOLTIPS
       mStaticText_TrackName->SetToolTip(newName);
    #endif
diff --git a/src/Theme.cpp b/src/Theme.cpp
index 02858f392..27798ceab 100644
--- a/src/Theme.cpp
+++ b/src/Theme.cpp
@@ -1308,13 +1308,14 @@ auStaticText::auStaticText(wxWindow* parent, wxString textIn) :
    SetBackgroundColour( theTheme.Colour( clrMedium));
    SetForegroundColour( theTheme.Colour( clrTrackPanelText));
    SetName(textIn);
+   SetLabel(textIn);
 }
  
 void auStaticText::OnPaint(wxPaintEvent & WXUNUSED(evt))
 {
    wxPaintDC dc(this);
    //dc.SetTextForeground( theTheme.Colour( clrTrackPanelText));
-   dc.DrawText( GetName(), 0,0);
+   dc.DrawText( GetLabel(), 0,0);
 }