diff --git a/profiler/src/profiler/TracyView_Messages.cpp b/profiler/src/profiler/TracyView_Messages.cpp
index f6ee29fd..cfc5e0a8 100644
--- a/profiler/src/profiler/TracyView_Messages.cpp
+++ b/profiler/src/profiler/TracyView_Messages.cpp
@@ -365,7 +365,7 @@ void View::DrawMessageLine( const MessageData& msg, bool hasCallstack, int& idx
     const auto cw = ImGui::GetContentRegionAvail().x;
     const auto tw = ImGui::CalcTextSize( text, tend ).x;
     ImGui::TextUnformatted( text, tend );
-    if( tw > cw && ImGui::IsItemHovered() )
+    if( (tw > cw || *tend != '\0') && ImGui::IsItemHovered() )
     {
         ImGui::SetNextWindowSize( ImVec2( 1000 * GetScale(), 0 ) );
         ImGui::BeginTooltip();
diff --git a/profiler/src/profiler/TracyView_ZoneInfo.cpp b/profiler/src/profiler/TracyView_ZoneInfo.cpp
index 7274cc4b..c99c2066 100644
--- a/profiler/src/profiler/TracyView_ZoneInfo.cpp
+++ b/profiler/src/profiler/TracyView_ZoneInfo.cpp
@@ -863,7 +863,7 @@ void View::DrawZoneInfoWindow()
                                 const auto cw = ImGui::GetContentRegionAvail().x;
                                 const auto tw = ImGui::CalcTextSize( text, tend ).x;
                                 ImGui::TextUnformatted( text, tend );
-                                if( tw > cw && ImGui::IsItemHovered() )
+                                if( (tw > cw || *tend != '\0') && ImGui::IsItemHovered() )
                                 {
                                     ImGui::SetNextWindowSize( ImVec2( 1000 * GetScale(), 0 ) );
                                     ImGui::BeginTooltip();