diff --git a/src/macro-core/macro-action-audio.cpp b/src/macro-core/macro-action-audio.cpp
index 58cd5a14..909b4cf9 100644
--- a/src/macro-core/macro-action-audio.cpp
+++ b/src/macro-core/macro-action-audio.cpp
@@ -437,12 +437,6 @@ void MacroActionAudioEdit::SetWidgetVisibility()
 	_balance->setVisible(_entryData->_action ==
 			     MacroActionAudio::Action::BALANCE);
 
-	_fadeTypes->setEnabled(_entryData->_fade);
-	_wait->setEnabled(_entryData->_fade);
-	_abortActiveFade->setEnabled(_entryData->_fade);
-	_duration->setEnabled(_entryData->_fade);
-	_rate->setEnabled(_entryData->_fade);
-
 	_fadeTypeLayout->removeWidget(_fade);
 	_fadeTypeLayout->removeWidget(_fadeTypes);
 	_fadeTypeLayout->removeWidget(_duration);
@@ -474,8 +468,10 @@ void MacroActionAudioEdit::SetWidgetVisibility()
 			 hasVolumeControl(_entryData->_action));
 	SetLayoutVisible(_fadeOptionsLayout,
 			 hasVolumeControl(_entryData->_action));
-	_abortActiveFade->setVisible(_entryData->_fade);
-	_wait->setVisible(_entryData->_fade);
+	_abortActiveFade->setVisible(hasVolumeControl(_entryData->_action) &&
+				     _entryData->_fade);
+	_wait->setVisible(hasVolumeControl(_entryData->_action) &&
+			  _entryData->_fade);
 
 	updateGeometry();
 	adjustSize();