diff --git a/core/model/SiteTree.php b/core/model/SiteTree.php
index 34e921843..b8872529d 100644
--- a/core/model/SiteTree.php
+++ b/core/model/SiteTree.php
@@ -1518,6 +1518,8 @@ class SiteTree extends DataObject {
 				$result[$class] = ($class == $this->class)
 				  ? _t('SiteTree.CURRENTLY', 'Currently').' '.$addAction
 				  : _t('SiteTree.CHANGETO', 'Change to').' '.$addAction;
+				$currentAddAction = null;
+				$currentClass = null;
 			}
 		}