diff --git a/app/controllers/todos_controller.rb b/app/controllers/todos_controller.rb
index ff5b767f..cf36bfaa 100644
--- a/app/controllers/todos_controller.rb
+++ b/app/controllers/todos_controller.rb
@@ -175,7 +175,10 @@ class TodosController < ApplicationController
   def update
     @source_view = params['_source_view'] || 'todo'
     init_data_for_sidebar unless mobile?
-    @todo.tag_with(params[:tag_list]) if params[:tag_list]
+    if params[:tag_list]
+      @todo.tag_with(params[:tag_list])
+      @todo.tags(true) #force a reload for proper rendering
+    end
     @original_item_context_id = @todo.context_id
     @original_item_project_id = @todo.project_id
     @original_item_was_deferred = @todo.deferred?
diff --git a/app/views/todos/edit.js.rjs b/app/views/todos/edit.js.rjs
index 9f6da060..9e57e85c 100644
--- a/app/views/todos/edit.js.rjs
+++ b/app/views/todos/edit.js.rjs
@@ -1,4 +1,4 @@
 page[dom_id(@todo, 'form')].down('.placeholder').replace_html :partial => 'todos/edit_form'
 page[dom_id(@todo, 'line')].hide
 page[dom_id(@todo, 'edit')].show
-page[dom_id(@todo, 'form')].down('table').down('input').focus
\ No newline at end of file
+page[dom_id(@todo, 'form')].down('input#todo_description').focus
\ No newline at end of file