diff --git a/core/model/SiteTree.php b/core/model/SiteTree.php
index b8872529d..cdda24cfc 100644
--- a/core/model/SiteTree.php
+++ b/core/model/SiteTree.php
@@ -1498,6 +1498,9 @@ class SiteTree extends DataObject {
 	protected function getClassDropdown() {
 		$classes = ClassInfo::getValidSubClasses('SiteTree');
 		array_shift($classes);
+		
+		$currentAddAction = null;
+		$currentClass = null;
 
 		foreach($classes as $class) {
 			$instance = singleton($class);
@@ -1518,8 +1521,6 @@ class SiteTree extends DataObject {
 				$result[$class] = ($class == $this->class)
 				  ? _t('SiteTree.CURRENTLY', 'Currently').' '.$addAction
 				  : _t('SiteTree.CHANGETO', 'Change to').' '.$addAction;
-				$currentAddAction = null;
-				$currentClass = null;
 			}
 		}