diff --git a/code/models/ElementalArea.php b/code/models/ElementalArea.php
index 4b415697..b5139f25 100644
--- a/code/models/ElementalArea.php
+++ b/code/models/ElementalArea.php
@@ -10,8 +10,14 @@ public function Elements() {
 
 		$list = new HasManyList('BaseElement', $result->getForeignKey());
 		$list->setDataModel($this->model);
+<<<<<<< HEAD
 		$list->sort('Sort ASC');
 
+=======
+		$list = $list->filter('Enabled', 1);
+		$list = $list->sort('Sort ASC');
+		
+>>>>>>> cc1bacfcf799bd97344a8219f8850b3a15cce8f7
 		$list = $list->forForeignID($this->ID);
 
 		return $list;