diff --git a/server/TracyView_FrameTree.cpp b/server/TracyView_FrameTree.cpp
index f9eb7d04..97fcfe26 100644
--- a/server/TracyView_FrameTree.cpp
+++ b/server/TracyView_FrameTree.cpp
@@ -440,10 +440,16 @@ void View::DrawFrameTreeLevel( const unordered_flat_map<uint64_t, MemCallstackFr
                 {
                     TextColoredUnformatted( 0xFF8888FF, frameName );
                 }
-                else
+                else if( m_shortenName == ShortenName::Never )
                 {
                     ImGui::TextUnformatted( frameName );
                 }
+                else
+                {
+                    const auto normalized = ShortenZoneName( ShortenName::OnlyNormalize, frameName );
+                    ImGui::TextUnformatted( normalized );
+                    TooltipNormalizedName( frameName, normalized );
+                }
                 ImGui::Unindent( ImGui::GetTreeNodeToLabelSpacing() );
             }
             else
@@ -453,11 +459,29 @@ void View::DrawFrameTreeLevel( const unordered_flat_map<uint64_t, MemCallstackFr
                 else if( isKernel ) ImGui::PushStyleColor( ImGuiCol_Text, 0xFF8888FF );
                 if( tree.size() == 1 )
                 {
-                    expand = ImGui::TreeNodeEx( frameName, ImGuiTreeNodeFlags_DefaultOpen );
+                    if( m_shortenName == ShortenName::Never )
+                    {
+                        expand = ImGui::TreeNodeEx( frameName, ImGuiTreeNodeFlags_DefaultOpen );
+                    }
+                    else
+                    {
+                        const auto normalized = ShortenZoneName( ShortenName::OnlyNormalize, frameName );
+                        expand = ImGui::TreeNodeEx( normalized, ImGuiTreeNodeFlags_DefaultOpen );
+                        TooltipNormalizedName( frameName, normalized );
+                    }
                 }
                 else
                 {
-                    expand = ImGui::TreeNode( frameName );
+                    if( m_shortenName == ShortenName::Never )
+                    {
+                        expand = ImGui::TreeNode( frameName );
+                    }
+                    else
+                    {
+                        const auto normalized = ShortenZoneName( ShortenName::OnlyNormalize, frameName );
+                        expand = ImGui::TreeNode( normalized );
+                        TooltipNormalizedName( frameName, normalized );
+                    }
                 }
                 if( isKernel || frameName[0] == '[' ) ImGui::PopStyleColor();
                 ImGui::PopID();