diff --git a/app/views/shared/_add_new_item_form.rhtml b/app/views/shared/_add_new_item_form.rhtml
index c40c1fb9..973434a7 100644
--- a/app/views/shared/_add_new_item_form.rhtml
+++ b/app/views/shared/_add_new_item_form.rhtml
@@ -70,6 +70,7 @@
     <script type="text/javascript" charset="utf-8">
 
       var contextNames = <%= context_names_for_autocomplete %>;
+      var projectNames = <%= project_names_for_autocomplete %>
 
       function askIfNewContextProvided() {
         var givenContextName = $('todo_context_name').value;
@@ -80,7 +81,7 @@
         return confirm('New context "' + givenContextName + '" will be also created. Are you sure?');
       }
 
-      var projectAutoCompleter = new Autocompleter.Local('todo_project_name', 'project_list', <%= project_names_for_autocomplete %>, {choices:100,autoSelect:false});
+      var projectAutoCompleter = new Autocompleter.Local('todo_project_name', 'project_list', projectNames, {choices:100,autoSelect:false});
 
       function selectDefaultContext() {
         todoContextNameElement = $('todo_context_name');
diff --git a/app/views/todos/_edit_form.rhtml b/app/views/todos/_edit_form.rhtml
index c9cf4eb0..6e0deefe 100644
--- a/app/views/todos/_edit_form.rhtml
+++ b/app/views/todos/_edit_form.rhtml
@@ -16,7 +16,7 @@
   <div class="page_name_auto_complete" id="<%= dom_id(@todo, 'project_list') %>" style="display:none"></div>
 
   <script type="text/javascript">
-  <%= dom_id(@todo, 'project_autocompleter') %> = new Autocompleter.Local('<%= dom_id(@todo, 'project_name') %>', '<%= dom_id(@todo, 'project_list') %>', <%= project_names_for_autocomplete %>, {choices:100,autoSelect:false});
+  <%= dom_id(@todo, 'project_autocompleter') %> = new Autocompleter.Local('<%= dom_id(@todo, 'project_name') %>', '<%= dom_id(@todo, 'project_list') %>', projectNames, {choices:100,autoSelect:false});
   function selectDefaultContext() {
     todoContextNameElement = $('<%= dom_id(@todo, 'context_name') %>');
     defaultContextName = $('todo_context_name').projectDefaultContextsMap[this.value];
@@ -36,7 +36,7 @@
   <div class="page_name_auto_complete" id="<%= dom_id(@todo, 'context_list') %>" style="display:none"></div>
 
   <script type="text/javascript">
-  <%= dom_id(@todo, 'context_autocompleter') %> = new Autocompleter.Local('<%= dom_id(@todo, 'context_name') %>', '<%= dom_id(@todo, 'context_list') %>', <%= context_names_for_autocomplete %>, {choices:100,autoSelect:false});
+  <%= dom_id(@todo, 'context_autocompleter') %> = new Autocompleter.Local('<%= dom_id(@todo, 'context_name') %>', '<%= dom_id(@todo, 'context_list') %>', contextNames, {choices:100,autoSelect:false});
   Event.observe($('<%= dom_id(@todo, 'context_name') %>'), "focus", function(){ $('<%= dom_id(@todo, 'context_name') %>').editedByTracksUser = true; });
   Event.observe($('<%= dom_id(@todo, 'context_name') %>'), "focus", <%= dom_id(@todo, 'context_autocompleter') %>.activate.bind(<%= dom_id(@todo, 'context_autocompleter') %>));
   Event.observe($('<%= dom_id(@todo, 'context_name') %>'), "click", <%= dom_id(@todo, 'context_autocompleter') %>.activate.bind(<%= dom_id(@todo, 'context_autocompleter') %>));
diff --git a/app/views/todos/calendar.html.erb b/app/views/todos/calendar.html.erb
index 9e705216..59a31e95 100644
--- a/app/views/todos/calendar.html.erb
+++ b/app/views/todos/calendar.html.erb
@@ -55,6 +55,8 @@
   <% # hack for #860 Need to refactor this and use another dom element to bind projectDefauiltContextsMap to -%>
   <input type="hidden" id="todo_context_name" value="hidden">
   <script type="text/javascript">
+    var contextNames = <%= context_names_for_autocomplete %>;
+    var projectNames = <%= project_names_for_autocomplete %>;
     $('todo_context_name').projectDefaultContextsMap = eval('(' + <%= @default_project_context_name_map %> + ')');
   </script>
   <!--