diff --git a/src/tracks/ui/ScrubUI.cpp b/src/tracks/ui/ScrubUI.cpp
index 56c0b0381..e1ce685c5 100644
--- a/src/tracks/ui/ScrubUI.cpp
+++ b/src/tracks/ui/ScrubUI.cpp
@@ -271,6 +271,7 @@ static const AudacityProject::AttachedObjects::RegisteredFactory sForwarderKey{
    []( AudacityProject &parent ){
       auto result = std::make_shared< ScrubForwarder >( parent );
       auto &window = ProjectWindow::Get( parent );
+      window.PushEventHandler( result.get() );
       return result;
    }
 };
diff --git a/src/tracks/ui/Scrubbing.cpp b/src/tracks/ui/Scrubbing.cpp
index 0797f160b..21697251a 100644
--- a/src/tracks/ui/Scrubbing.cpp
+++ b/src/tracks/ui/Scrubbing.cpp
@@ -241,6 +241,9 @@ Scrubber::~Scrubber()
    if (mpThread)
       mpThread->Delete();
 #endif
+
+   if ( mWindow )
+      mWindow->PopEventHandler();
 }
 
 static const auto HasWaveDataPred =