diff --git a/editor/settings.py b/editor/settings.py
index a235f82..ea68b7b 100644
--- a/editor/settings.py
+++ b/editor/settings.py
@@ -7,3 +7,5 @@ STATIC_URL = getattr(settings, 'STATIC_URL', settings.MEDIA_URL)
 if STATIC_URL == None:
     STATIC_URL = settings.MEDIA_URL
 MEDIA_PATH = getattr(settings, 'EDITOR_MEDIA_PATH', '%seditor/' % STATIC_URL)
+
+TREE_INITIAL_STATE = getattr(settings, 'EDITOR_TREE_INITIAL_STATE', 'collapsed')
\ No newline at end of file
diff --git a/editor/templates/admin/editor/tree_editor.html b/editor/templates/admin/editor/tree_editor.html
index 5712bda..b821f05 100644
--- a/editor/templates/admin/editor/tree_editor.html
+++ b/editor/templates/admin/editor/tree_editor.html
@@ -5,8 +5,7 @@
 	<script type="text/javascript">
 	(function($) {
 		$(document).ready(function()  {
-		//treeTable = $("#result_list").treeTable({initialState : "expanded"});
-		treeTable = $("#result_list").treeTable({initialState : "collapsed"});
+		treeTable = $("#result_list").treeTable({initialState : "{{ EDITOR_TREE_INITIAL_STATE }}"});
 		function toggleChildren() {
 			this.checked = event.currentTarget.checked;
 			var row = this.parentNode.parentNode.parentNode;
diff --git a/editor/tree_editor.py b/editor/tree_editor.py
index e7baa27..e84c0e5 100644
--- a/editor/tree_editor.py
+++ b/editor/tree_editor.py
@@ -77,6 +77,7 @@ class TreeEditor(admin.ModelAdmin):
         """
         extra_context = extra_context or {}
         extra_context['EDITOR_MEDIA_PATH'] = settings.MEDIA_PATH
+        extra_context['EDITOR_TREE_INITIAL_STATE'] = settings.TREE_INITIAL_STATE
         extra_context['tree_structure'] = mark_safe(simplejson.dumps(
                                                     _build_tree_structure(self.model)))