diff --git a/qt-ui/diveplanner.cpp b/qt-ui/diveplanner.cpp
index 215898389..c3ba26932 100644
--- a/qt-ui/diveplanner.cpp
+++ b/qt-ui/diveplanner.cpp
@@ -116,7 +116,7 @@ void DivePlannerPointsModel::copyCylinders(dive *d)
 // setup the cylinder widget accordingly
 void DivePlannerPointsModel::setupCylinders()
 {
-	if (!stagingDive)
+	if (!stagingDive || stagingDive == current_dive)
 		return;
 
 	if (current_dive) {