diff --git a/src/headers/macro-condition-scene.hpp b/src/headers/macro-condition-scene.hpp
index 1d5e8e9b..8e823fca 100644
--- a/src/headers/macro-condition-scene.hpp
+++ b/src/headers/macro-condition-scene.hpp
@@ -25,7 +25,10 @@ public:
 		return std::make_shared<MacroConditionScene>();
 	}
 
-	bool _waitForTransition = false;
+	// This option is to be removed in a future version and be replaced by
+	// transition specific conditions
+	bool _waitForTransition = true;
+
 	SceneSelection _scene;
 	SceneType _type;
 
diff --git a/src/macro-condition-scene.cpp b/src/macro-condition-scene.cpp
index bdb6a3dc..8e56f0b8 100644
--- a/src/macro-condition-scene.cpp
+++ b/src/macro-condition-scene.cpp
@@ -158,7 +158,12 @@ void MacroConditionSceneEdit::SetWidgetVisibility()
 {
 	_scenes->setVisible(_entryData->_type == SceneType::CURRENT ||
 			    _entryData->_type == SceneType::PREVIOUS);
-	_waitForTransition->setVisible(_entryData->_type == SceneType::CURRENT);
+
+	// The waitForTransition option shall be slowly faded out over time and
+	// be replaced by the transition source and target scene checks
+	_waitForTransition->setVisible(_entryData->_type ==
+					       SceneType::CURRENT &&
+				       !_entryData->_waitForTransition);
 }
 
 void MacroConditionSceneEdit::UpdateEntryData()