diff --git a/tracks/app/views/shared/_add_new_item_form.rhtml b/tracks/app/views/shared/_add_new_item_form.rhtml
index 7d469a20..def1d9b6 100644
--- a/tracks/app/views/shared/_add_new_item_form.rhtml
+++ b/tracks/app/views/shared/_add_new_item_form.rhtml
@@ -57,7 +57,7 @@ Event.observe($('todo_project_name'), "blur", selectDefaultContext.bind($('todo_
 
 <script type="text/javascript">
 contextAutoCompleter = new Autocompleter.Local('todo_context_name', 'context_list', <%= context_names_for_autocomplete %>, {choices:100,autoSelect:false});
-$('todo_context_name').projectDefaultContextsMap = <%= @default_project_context_name_map %>;
+$('todo_context_name').projectDefaultContextsMap = eval('(' + <%= @default_project_context_name_map %> + ')');
 Event.observe($('todo_context_name'), "focus", function(){ $('todo_context_name').editedByTracksUser = true; });
 Event.observe($('todo_context_name'), "focus", contextAutoCompleter.activate.bind(contextAutoCompleter));
 Event.observe($('todo_context_name'), "click", contextAutoCompleter.activate.bind(contextAutoCompleter));
diff --git a/tracks/test/fixtures/projects.yml b/tracks/test/fixtures/projects.yml
index daac4ced..010c4fdc 100644
--- a/tracks/test/fixtures/projects.yml
+++ b/tracks/test/fixtures/projects.yml
@@ -14,6 +14,7 @@ timemachine:
   user_id: 1
   created_at: <%= today %>
   updated_at: <%= today %>
+  default_context_id: 5
 
 moremoney:
   id: 2
diff --git a/tracks/test/functional/todos_controller_test.rb b/tracks/test/functional/todos_controller_test.rb
index 171c2b24..05b77863 100644
--- a/tracks/test/functional/todos_controller_test.rb
+++ b/tracks/test/functional/todos_controller_test.rb
@@ -281,4 +281,10 @@ class TodosControllerTest < Test::Rails::TestCase
     assert_equal Date.new(2007,1,2).to_s, t.due.to_s
   end
 
+  def test_index_html_assigns_default_project_name_map
+    @request.session['user_id'] = users(:admin_user).id
+    get :index, {"format"=>"html"}
+    assert_equal '"{\\"Build a working time machine\\": \\"lab\\"}"', assigns(:default_project_context_name_map)
+  end
+
 end