diff --git a/src/toolbars/ControlToolBar.cpp b/src/toolbars/ControlToolBar.cpp
index 593f845e5..c57377b75 100644
--- a/src/toolbars/ControlToolBar.cpp
+++ b/src/toolbars/ControlToolBar.cpp
@@ -877,7 +877,10 @@ void ControlToolBar::OnRecord(wxCommandEvent &evt)
    }
 
    if (gAudioIO->IsBusy()) {
-      mRecord->PopUp();
+      if (!CanStopAudioStream() || 0 == gAudioIO->GetNumCaptureChannels())
+         mRecord->PopUp();
+      else
+         mRecord->PushDown();
       return;
    }
    AudacityProject *p = GetActiveProject();