diff --git a/plugins/base/macro-action-transition.cpp b/plugins/base/macro-action-transition.cpp
index 7c796c90..cafcc812 100644
--- a/plugins/base/macro-action-transition.cpp
+++ b/plugins/base/macro-action-transition.cpp
@@ -406,15 +406,17 @@ void MacroActionTransitionEdit::SetWidgetVisibility()
 			    MacroActionTransition::Type::TBAR;
 	const bool isReleaseTbar = _entryData->_type ==
 				   MacroActionTransition::Type::RELEASE_TBAR;
-	_sources->setVisible(
-		_entryData->_type == MacroActionTransition::Type::SOURCE_HIDE ||
-		_entryData->_type == MacroActionTransition::Type::SOURCE_SHOW);
+	const bool isSourceTransition =
+		_entryData->_type == MacroActionTransition::Type::SOURCE_SHOW ||
+		_entryData->_type == MacroActionTransition::Type::SOURCE_HIDE;
+	_sources->setVisible(isSourceTransition);
 	_scenes->setVisible(_entryData->_type !=
 				    MacroActionTransition::Type::SCENE &&
 			    !isTbar && !isReleaseTbar);
 	SetLayoutVisible(_transitionLayout, !isTbar && !isReleaseTbar);
 	SetLayoutVisible(_durationLayout, !isTbar && !isReleaseTbar);
 	SetLayoutVisible(_tbarLayout, isTbar);
+	_transitions->EnableNoneEntry(isSourceTransition);
 	adjustSize();
 }
 
diff --git a/plugins/base/utils/transition-selection.cpp b/plugins/base/utils/transition-selection.cpp
index fdd870ee..8a33499e 100644
--- a/plugins/base/utils/transition-selection.cpp
+++ b/plugins/base/utils/transition-selection.cpp
@@ -133,8 +133,13 @@ void TransitionSelectionWidget::EnableAnyEntry(bool enable)
 
 void TransitionSelectionWidget::EnableNoneEntry(bool enable)
 {
+	if (_addNone == enable) {
+		return;
+	}
+	const auto selection = GetCurrentSelection();
 	_addNone = enable;
 	Populate();
+	SetTransition(selection);
 }
 
 void TransitionSelectionWidget::showEvent(QShowEvent *event)