diff --git a/server/TracyView.cpp b/server/TracyView.cpp
index 3fe2f88f..23bc482d 100644
--- a/server/TracyView.cpp
+++ b/server/TracyView.cpp
@@ -1442,13 +1442,20 @@ bool View::DrawZoneFrames( const FrameData& frames )
         prev = -1;
     }
 
-    if( hover && !tooltipDisplayed )
+    if( hover )
     {
-        ImGui::BeginTooltip();
-        ImGui::TextDisabled( "Frame set:" );
-        ImGui::SameLine();
-        ImGui::Text( "%s", frames.name == 0 ? "Frames" : m_worker.GetString( frames.name ) );
-        ImGui::EndTooltip();
+        if( !tooltipDisplayed )
+        {
+            ImGui::BeginTooltip();
+            ImGui::TextDisabled( "Frame set:" );
+            ImGui::SameLine();
+            ImGui::Text( "%s", frames.name == 0 ? "Frames" : m_worker.GetString( frames.name ) );
+            ImGui::EndTooltip();
+        }
+        if( ImGui::IsMouseClicked( 0 ) )
+        {
+            m_frames = &frames;
+        }
     }
 
     return hover;