diff --git a/src/Menus.cpp b/src/Menus.cpp
index bc2aa45ad..4f987cf6f 100644
--- a/src/Menus.cpp
+++ b/src/Menus.cpp
@@ -548,7 +548,7 @@ CommandFlag MenuManager::GetUpdateFlags
    if (!EffectManager::Get().RealtimeIsActive())
       flags |= IsRealtimeNotActiveFlag;
 
-      if (!project.IsCapturing())
+   if ( !( gAudioIO->IsBusy() && gAudioIO->GetNumCaptureChannels() > 0 ) )
       flags |= CaptureNotBusyFlag;
 
    ControlToolBar *bar = project.GetControlToolBar();
diff --git a/src/Project.cpp b/src/Project.cpp
index bd0f491b1..346c79fe5 100644
--- a/src/Project.cpp
+++ b/src/Project.cpp
@@ -1438,10 +1438,6 @@ AudacityProject::AudacityProject(wxWindow * parent, wxWindowID id,
    mTrackPanel->SetDropTarget(safenew DropTarget(this));
 #endif
 
-   wxTheApp->Bind(EVT_AUDIOIO_CAPTURE,
-                     &AudacityProject::OnCapture,
-                     this);
-
    wxTheApp->Bind(EVT_THEME_CHANGE, &AudacityProject::OnThemeChange, this);
 
 #ifdef EXPERIMENTAL_DA2
@@ -1565,16 +1561,6 @@ void AudacityProject::RefreshCursor()
    mTrackPanel->HandleCursorForPresentMouseState();
 }
 
-void AudacityProject::OnCapture(wxCommandEvent& evt)
-{
-   evt.Skip();
-
-   if (evt.GetInt() != 0)
-      mIsCapturing = true;
-   else
-      mIsCapturing = false;
-}
-
 void AudacityProject::OnThemeChange(wxCommandEvent& evt)
 {
    evt.Skip();
@@ -1588,7 +1574,6 @@ void AudacityProject::OnThemeChange(wxCommandEvent& evt)
    GetRulerPanel()->ReCreateButtons();
 }
 
-
 const std::shared_ptr<DirManager> &AudacityProject::GetDirManager()
 {
    return mDirManager;
diff --git a/src/Project.h b/src/Project.h
index 9647d7163..99a5562ba 100644
--- a/src/Project.h
+++ b/src/Project.h
@@ -542,7 +542,6 @@ public:
 
  private:
 
-   void OnCapture(wxCommandEvent & evt);
    void OnThemeChange(wxCommandEvent & evt);
    void InitialState();
 
@@ -711,14 +710,6 @@ public:
 private:
    bool mbInitializingScrollbar{ false };
 
-   // Flag that we're recoding.
-   bool mIsCapturing{ false };
-
-public:
-   bool IsCapturing() const { return mIsCapturing; }
-
-private:
-
    // See explanation in OnCloseWindow
    bool mIsBeingDeleted{ false };