diff --git a/src/tracks/ui/SelectHandle.cpp b/src/tracks/ui/SelectHandle.cpp
index 0439afb14..a5c017d98 100644
--- a/src/tracks/ui/SelectHandle.cpp
+++ b/src/tracks/ui/SelectHandle.cpp
@@ -487,12 +487,12 @@ namespace {
    }
 }
 
-void SelectHandle::Enter(bool, AudacityProject *)
+void SelectHandle::Enter(bool, AudacityProject *project)
 {
-   SetUseSnap(true);
+   SetUseSnap(true, project);
 }
 
-void SelectHandle::SetUseSnap(bool use)
+void SelectHandle::SetUseSnap(bool use, AudacityProject *project)
 {
    mUseSnap = use;
 
@@ -504,7 +504,7 @@ void SelectHandle::SetUseSnap(bool use)
    if (IsClicked()) {
       // Readjust the moving selection end
       AssignSelection(
-         ViewInfo::Get( *::GetActiveProject() ),
+         ViewInfo::Get( *project ),
          mUseSnap ? mSnapEnd.outTime : mSnapEnd.timeSnappedTime,
          nullptr);
    }
@@ -521,10 +521,10 @@ bool SelectHandle::HasEscape() const
    return HasSnap() && mUseSnap;
 }
 
-bool SelectHandle::Escape(AudacityProject *)
+bool SelectHandle::Escape(AudacityProject *project)
 {
    if (SelectHandle::HasEscape()) {
-      SetUseSnap(false);
+      SetUseSnap(false, project);
       return true;
    }
    return false;
diff --git a/src/tracks/ui/SelectHandle.h b/src/tracks/ui/SelectHandle.h
index fd62b263b..84ff8a8dc 100644
--- a/src/tracks/ui/SelectHandle.h
+++ b/src/tracks/ui/SelectHandle.h
@@ -50,13 +50,13 @@ public:
 
    bool IsClicked() const;
 
-   void SetUseSnap(bool use);
-   void Enter(bool forward, AudacityProject *) override;
+   void SetUseSnap(bool use, AudacityProject *pProject);
+   void Enter(bool forward, AudacityProject *pProject) override;
 
    bool HasSnap() const;
    bool HasEscape() const override;
 
-   bool Escape(AudacityProject *) override;
+   bool Escape(AudacityProject *pProject) override;
 
    Result Click
       (const TrackPanelMouseEvent &event, AudacityProject *pProject) override;