diff --git a/profiler/src/profiler/TracyTimelineItemThread.cpp b/profiler/src/profiler/TracyTimelineItemThread.cpp
index 79e3349e..572e550f 100644
--- a/profiler/src/profiler/TracyTimelineItemThread.cpp
+++ b/profiler/src/profiler/TracyTimelineItemThread.cpp
@@ -277,7 +277,7 @@ void TimelineItemThread::DrawOverlay( const ImVec2& ul, const ImVec2& dr )
 
 void TimelineItemThread::DrawExtraPopupItems()
 {
-    if( ImGui::MenuItem( ICON_FA_TIMELINE " Select in CPU timeline" ) )
+    if( m_view.GetViewData().drawCpuUsageGraph && ImGui::MenuItem( ICON_FA_TIMELINE " Select in CPU timeline" ) )
     {
         m_view.HighlightThread( m_thread->id, true );
     }
diff --git a/profiler/src/profiler/TracyView_Timeline.cpp b/profiler/src/profiler/TracyView_Timeline.cpp
index 43ea94a0..eb3f90b8 100644
--- a/profiler/src/profiler/TracyView_Timeline.cpp
+++ b/profiler/src/profiler/TracyView_Timeline.cpp
@@ -242,7 +242,11 @@ void View::DrawTimeline()
     m_msgHighlight.Decay( nullptr );
     m_zoneSrcLocHighlight.Decay( 0 );
     m_lockHoverHighlight.Decay( InvalidId );
-    if ( !m_freezeCpuDataSelectedThread )
+    if( !m_vd.drawCpuUsageGraph )
+    {
+        m_freezeCpuDataSelectedThread = 0;
+    }
+    if( !m_freezeCpuDataSelectedThread )
     {
         m_drawThreadMigrations.Decay( 0 );
         m_drawThreadHighlight.Decay( 0 );