diff --git a/src/mac/carbon/stattext.cpp b/src/mac/carbon/stattext.cpp
index a3fc3c3268..38dcf897cd 100644
--- a/src/mac/carbon/stattext.cpp
+++ b/src/mac/carbon/stattext.cpp
@@ -137,9 +137,9 @@ wxSize wxStaticText::DoGetBestSize() const
 
 void wxStaticText::SetLabel( const wxString& st )
 {
-    m_label = GetLabelText( st );
+    m_label =  st;
 
-    wxMacCFStringHolder str( m_label, m_font.GetEncoding() );
+    wxMacCFStringHolder str( GetLabelText(m_label), m_font.GetEncoding() );
     CFStringRef ref = str;
     OSStatus err = m_peer->SetData<CFStringRef>(kControlEntireControl, kControlStaticTextCFStringTag, ref );
     verify_noerr( err );
diff --git a/src/mac/carbon/window.cpp b/src/mac/carbon/window.cpp
index 589b047316..63309a70e6 100644
--- a/src/mac/carbon/window.cpp
+++ b/src/mac/carbon/window.cpp
@@ -2142,10 +2142,10 @@ void wxWindowMac::DoSetClientSize(int clientwidth, int clientheight)
 
 void wxWindowMac::SetLabel(const wxString& title)
 {
-    m_label = wxStripMenuCodes(title, wxStrip_Mnemonics) ;
+    m_label = title ;
 
     if ( m_peer && m_peer->Ok() )
-        m_peer->SetLabel( m_label ) ;
+        m_peer->SetLabel( wxStripMenuCodes(m_label, wxStrip_Mnemonics) ) ;
 
     // do not trigger refreshes upon invisible and possible partly created objects
     if ( MacIsReallyShown() )