diff --git a/Source/Processors/Editors/RHD2000Editor.cpp b/Source/Processors/Editors/RHD2000Editor.cpp
index 2ba24de678d0bfab70a8d8f75a13f5461aab145a..e8e36c993f01db0070bec607fd65901e8dde659d 100644
--- a/Source/Processors/Editors/RHD2000Editor.cpp
+++ b/Source/Processors/Editors/RHD2000Editor.cpp
@@ -115,7 +115,7 @@ void RHD2000Editor::scanPorts()
 void RHD2000Editor::buttonEvent(Button* button)
 {
 
-    if (button == rescanButton)
+    if (button == rescanButton && !acquisitionIsActive)
     {
         board->scanPorts();
 
@@ -133,7 +133,7 @@ void RHD2000Editor::buttonEvent(Button* button)
     {
         channelSelector->setRadioStatus(true);
     }
-    else if (button == adcButton)
+    else if (button == adcButton && !acquisitionIsActive)
     {
         board->enableAdcs(button->getToggleState());
         getEditorViewport()->makeEditorVisible(this, false, true);