diff --git a/src/tracks/ui/ButtonHandle.h b/src/tracks/ui/ButtonHandle.h
index 9413e7336..9d13cb9cb 100644
--- a/src/tracks/ui/ButtonHandle.h
+++ b/src/tracks/ui/ButtonHandle.h
@@ -42,23 +42,25 @@ protected:
    virtual Result CommitChanges
       (const wxMouseEvent &event, AudacityProject *pProject, wxWindow *pParent) = 0;
 
-   void Enter(bool forward) override;
+   void Enter(bool forward) final override;
 
    Result Click
-      (const TrackPanelMouseEvent &event, AudacityProject *pProject) override;
+      (const TrackPanelMouseEvent &event, AudacityProject *pProject)
+      final override;
 
    Result Drag
-      (const TrackPanelMouseEvent &event, AudacityProject *pProject) override;
+      (const TrackPanelMouseEvent &event, AudacityProject *pProject)
+      final override;
 
    HitTestPreview Preview
       (const TrackPanelMouseState &state, const AudacityProject *pProject)
-      override;
+      final override;
 
    Result Release
       (const TrackPanelMouseEvent &event, AudacityProject *pProject,
-       wxWindow *pParent) override;
+       wxWindow *pParent) final override;
 
-   Result Cancel(AudacityProject *pProject) override;
+   Result Cancel(AudacityProject *pProject) final override;
 
    std::weak_ptr<Track> mpTrack;
    wxRect mRect;
diff --git a/src/tracks/ui/SliderHandle.h b/src/tracks/ui/SliderHandle.h
index 44a3be3c4..71e1b1529 100644
--- a/src/tracks/ui/SliderHandle.h
+++ b/src/tracks/ui/SliderHandle.h
@@ -50,20 +50,22 @@ protected:
    void Enter(bool forward) override;
 
    Result Click
-      (const TrackPanelMouseEvent &event, AudacityProject *pProject) override;
+      (const TrackPanelMouseEvent &event, AudacityProject *pProject)
+      final override;
 
    Result Drag
-      (const TrackPanelMouseEvent &event, AudacityProject *pProject) override;
+      (const TrackPanelMouseEvent &event, AudacityProject *pProject)
+      final override;
 
    HitTestPreview Preview
       (const TrackPanelMouseState &state, const AudacityProject *pProject)
-      override;
+      final override;
 
    Result Release
       (const TrackPanelMouseEvent &event, AudacityProject *pProject,
-       wxWindow *pParent) override;
+       wxWindow *pParent) final override;
 
-   Result Cancel(AudacityProject *pProject) override;
+   Result Cancel(AudacityProject *pProject) final override;
 
    // Derived class is expected to set these two before Click():
    std::weak_ptr<Track> mpTrack;