diff --git a/profiler/src/profiler/TracyView_CpuData.cpp b/profiler/src/profiler/TracyView_CpuData.cpp
index ec106b45..b9a9ed8b 100644
--- a/profiler/src/profiler/TracyView_CpuData.cpp
+++ b/profiler/src/profiler/TracyView_CpuData.cpp
@@ -444,7 +444,7 @@ bool View::DrawCpuData( const TimelineContext& ctx, const std::vector<CpuUsageDr
         offset += sstep;
     }
 
-    if( IsMouseClickReleased( ImGuiMouseButton_Left ) && ImGui::IsMouseHoveringRect( wpos, wpos + ImVec2( w, offset ) ) )
+    if( ImGui::IsMouseHoveringRect( wpos, wpos + ImVec2( w, offset ) ) && IsMouseClickReleased( ImGuiMouseButton_Left ) )
     {
         if( m_drawThreadHighlight != 0 )
         {
diff --git a/profiler/src/profiler/TracyView_Timeline.cpp b/profiler/src/profiler/TracyView_Timeline.cpp
index 2f58060e..5200fd2c 100644
--- a/profiler/src/profiler/TracyView_Timeline.cpp
+++ b/profiler/src/profiler/TracyView_Timeline.cpp
@@ -31,7 +31,7 @@ void View::HandleTimelineMouse( int64_t timespan, const ImVec2& wpos, float w )
     {
         m_highlight.end = m_vd.zvStart + ( io.MousePos.x - wpos.x ) * nspx;
     }
-    else if( m_highlight.active )
+    else if( m_highlight.active && !IsMouseDown( 0 ) )
     {
         if( ImGui::GetIO().KeyCtrl && m_highlight.start != m_highlight.end )
         {
@@ -49,7 +49,7 @@ void View::HandleTimelineMouse( int64_t timespan, const ImVec2& wpos, float w )
     {
         m_highlightZoom.end = m_vd.zvStart + ( io.MousePos.x - wpos.x ) * nspx;
     }
-    else if( m_highlightZoom.active )
+    else if( m_highlightZoom.active && !IsMouseDown( 2 )  )
     {
         if( m_highlightZoom.start != m_highlightZoom.end )
         {