diff --git a/src/libs/tracing/qml/FlameGraphView.qml b/src/libs/tracing/qml/FlameGraphView.qml
index 956b312ef9c..b8706d03797 100644
--- a/src/libs/tracing/qml/FlameGraphView.qml
+++ b/src/libs/tracing/qml/FlameGraphView.qml
@@ -170,7 +170,7 @@ ScrollView {
                 borderColor: {
                     if (isSelected)
                         return flamegraph.blue2;
-                    else if (tooltip.hoveredNode === flamegraphItem)
+                    else if (tooltip.currentNode === flamegraphItem)
                         return flamegraph.blue1;
                     else if (note() !== "" || isHighlighted)
                         return flamegraph.highlight;
@@ -178,8 +178,7 @@ ScrollView {
                         return flamegraph.grey1;
                 }
                 borderWidth: {
-                    if (tooltip.hoveredNode === flamegraphItem ||
-                            tooltip.selectedNode === flamegraphItem) {
+                    if (tooltip.currentNode === flamegraphItem) {
                         return 2;
                     } else if (note() !== "" || isHighlighted) {
                         return 3;
@@ -280,7 +279,7 @@ ScrollView {
             property var selectedNode: null;
 
             property var currentNode: {
-                if (hoveredNode !== null)
+                if (!locked && hoveredNode !== null)
                     return hoveredNode;
                 else if (selectedNode !== null)
                     return selectedNode;
diff --git a/src/libs/tracing/qml/MainView.qml b/src/libs/tracing/qml/MainView.qml
index 654b544442e..03e3fceeada 100644
--- a/src/libs/tracing/qml/MainView.qml
+++ b/src/libs/tracing/qml/MainView.qml
@@ -371,8 +371,8 @@ Rectangle {
             content.select(selectedModel, selectedItem)
         }
 
-        onToggleSelectionLocked: {
-            content.selectionLocked = !content.selectionLocked;
+        onLockedChanged: {
+            content.selectionLocked = locked;
         }
 
         onClearSelection: {
diff --git a/src/libs/tracing/qml/RangeDetails.qml b/src/libs/tracing/qml/RangeDetails.qml
index 9913f36bdf3..22d5811f489 100644
--- a/src/libs/tracing/qml/RangeDetails.qml
+++ b/src/libs/tracing/qml/RangeDetails.qml
@@ -54,7 +54,6 @@ Item {
     property alias noteReadonly: noteEdit.readOnly
 
     signal recenterOnItem
-    signal toggleSelectionLocked
     signal clearSelection
     signal updateNote(string text)
 
@@ -117,7 +116,7 @@ Item {
             anchors.top: closeIcon.top
             anchors.right: closeIcon.left
             implicitHeight: typeTitle.height
-            onClicked: rangeDetails.toggleSelectionLocked()
+            onClicked: locked = !locked
         }
 
         ImageToolButton {