diff --git a/app/assets/javascripts/tracks.js b/app/assets/javascripts/tracks.js
index c6943302..91301cc9 100644
--- a/app/assets/javascripts/tracks.js
+++ b/app/assets/javascripts/tracks.js
@@ -34,8 +34,9 @@ var TracksForm = {
         $('#default_project_name_id').val(name);
         $('#project_name').html(name);
     },
-    set_tag_list: function (name) {
+    set_tag_list_and_default_tag_list: function (name) {
         $('input#tag_list').val(name);
+        $('input#initial_tag_list').val(name);
     },
     set_tag_list_for_multi_add: function (name) {
         $('#multi_tag_list').val(name);
diff --git a/app/views/projects/update.js.erb b/app/views/projects/update.js.erb
index c737ab97..25e84e81 100644
--- a/app/views/projects/update.js.erb
+++ b/app/views/projects/update.js.erb
@@ -36,7 +36,7 @@ function update_project_page() {
     TracksForm.set_context_name_and_default_context_name("<%= escape_javascript(@project.default_context.name)%>");
   <% end %>
   <% if @project.default_tags %>
-    TracksForm.set_tag_list("<%= escape_javascript(@project.default_tags)%>");
+    TracksForm.set_tag_list_and_default_tag_list("<%= escape_javascript(@project.default_tags)%>");
   <% end %>
   TracksPages.update_sidebar(html_for_sidebar());
 }
diff --git a/app/views/todos/create.js.erb b/app/views/todos/create.js.erb
index a097f2ef..08dadf71 100644
--- a/app/views/todos/create.js.erb
+++ b/app/views/todos/create.js.erb
@@ -31,7 +31,7 @@
     $('#todo-form-new-action').clearDeps();
     TracksForm.set_context_name('<%=escape_javascript @initial_context_name%>');
     TracksForm.set_project_name('<%=escape_javascript @initial_project_name%>');
-    TracksForm.set_tag_list('<%=escape_javascript @initial_tags%>');
+    TracksForm.set_tag_list_and_default_tag_list('<%=escape_javascript @initial_tags%>');
     $('#todo-form-new-action input:text:first').focus();
     $('#new_todo_starred_link .todo_star').removeClass('starred');
     $('#new_todo_starred').val('false');
@@ -86,4 +86,4 @@
     return "<%= @saved ? escape_javascript(render(:partial => @todo, :locals => { :parent_container_type => parent_container_type, :source_view => @source_view })) : "" %>";
   }
   
-<% end -%>
\ No newline at end of file
+<% end -%>