diff --git a/CHANGELOG.md b/CHANGELOG.md
index c392cb7..3112bfb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,8 +15,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Fixed
 
-- Bug that prevented removal of last switch from list of available switches for stops, couplers and tremulants.
+- Bug that prevented removal of last switch from list of available switches for stops, couplers, tremulants and divisional couplers.
 - Bug that prevented removal of last rank from list of available ranks for stops.
+- Bug that prevented removal of last manual from list of available manuals for divisional couplers.
 - Updating windchest wxChoice size for rank (and stop internal rank) to expand as needed.
 
 ## [0.12.2] - 2024-05-22
diff --git a/src/DivisionalCouplerPanel.cpp b/src/DivisionalCouplerPanel.cpp
index 82864ca..02b2b37 100644
--- a/src/DivisionalCouplerPanel.cpp
+++ b/src/DivisionalCouplerPanel.cpp
@@ -386,6 +386,9 @@ void DivisionalCouplerPanel::setDivisionalCoupler(DivisionalCoupler *divCplr) {
 		}
 		m_availableSwitches->Clear();
 		m_availableSwitches->InsertItems(organSwitches, 0);
+	} else {
+		if (m_availableSwitches->GetCount())
+			m_availableSwitches->Clear();
 	}
 	UpdateReferencedSwitches();
 	m_addReferencedSwitch->Disable();
@@ -400,6 +403,9 @@ void DivisionalCouplerPanel::setDivisionalCoupler(DivisionalCoupler *divCplr) {
 		}
 		m_availableManuals->Clear();
 		m_availableManuals->InsertItems(organManuals, 0);
+	} else {
+		if (m_availableManuals->GetCount())
+			m_availableManuals->Clear();
 	}
 	UpdateReferencedManuals();
 	m_addReferencedManual->Disable();