diff --git a/com.unity.cinemachine/Editor/Editors/CinemachineSplineRollEditor.cs b/com.unity.cinemachine/Editor/Editors/CinemachineSplineRollEditor.cs
index 4d8d6dc76..9f8170ccf 100644
--- a/com.unity.cinemachine/Editor/Editors/CinemachineSplineRollEditor.cs
+++ b/com.unity.cinemachine/Editor/Editors/CinemachineSplineRollEditor.cs
@@ -15,6 +15,11 @@ class CinemachineSplineRollEditor : UnityEditor.Editor
         public override VisualElement CreateInspectorGUI()
         {
             var ux = new VisualElement();
+
+            ux.Add(new Button(() => ToolManager.SetActiveTool(typeof(SplineRollTool))) 
+                { text = "Edit Data Points in Scene View" });
+            ux.AddSpace();
+
             var prop = serializedObject.GetIterator();
             if (prop.NextVisible(true))
                 InspectorUtility.AddRemainingProperties(ux, prop);
@@ -147,7 +152,7 @@ static void OnSplineDataChanged(SplineData<float> data)
     }
 
 
-    [EditorTool("Roll Tool", typeof(CinemachineSplineRoll))]
+    [EditorTool("Spline Roll Tool", typeof(CinemachineSplineRoll))]
     sealed class SplineRollTool : EditorTool, IDrawSelectedHandles
     {
         GUIContent m_IconContent;
@@ -272,7 +277,6 @@ bool DrawDataPoint(int controlID, Vector3 position, Vector3 tangent, Vector3 up,
                         return true;
                     }
                 }
-
                 return false;
             }
         }