diff --git a/server/TracyView.cpp b/server/TracyView.cpp
index 13462aa0..99f045ca 100644
--- a/server/TracyView.cpp
+++ b/server/TracyView.cpp
@@ -10519,15 +10519,20 @@ void View::DrawCpuDataWindow()
             for( auto& tid : pid.second.tids )
             {
                 const auto tidMatch = pidMatch && m_worker.IsThreadLocal( tid );
+                auto tname = m_worker.GetExternalName( tid ).second;
                 if( tidMatch )
                 {
+                    auto lname = m_worker.GetThreadString( tid );
+                    const auto tsz = strlen( tname );
+                    const auto lsz = strlen( lname );
+                    if( lsz > tsz && strncmp( tname, lname, tsz ) == 0 ) tname = lname;
                     ImGui::PushStyleColor( ImGuiCol_Text, ImVec4( 1.0f, 1.0f, 0.2f, 1.0f ) );
                 }
                 const auto& tit = ctd.find( tid );
                 assert( tit != ctd.end() );
                 ImGui::TextUnformatted( RealToString( tid, true ) );
                 ImGui::NextColumn();
-                ImGui::TextUnformatted( m_worker.GetExternalName( tid ).second );
+                ImGui::TextUnformatted( tname );
                 ImGui::NextColumn();
                 sprintf( buf, "%s (%.2f%%)", TimeToString( tit->second.runningTime ), double( tit->second.runningTime ) * rtimespan * 100 );
                 ImGui::ProgressBar( double( tit->second.runningTime ) * rtimespan, ImVec2( -1, ty ), buf );