diff --git a/app/controllers/todos_controller.rb b/app/controllers/todos_controller.rb
index 36cc7435..197245b0 100644
--- a/app/controllers/todos_controller.rb
+++ b/app/controllers/todos_controller.rb
@@ -397,7 +397,7 @@ class TodosController < ApplicationController
     @todo = current_user.todos.find(params[:id])
     @original_item_context_id = @todo.context_id
     @original_item = current_user.todos.build(@todo.attributes)  # create a (unsaved) copy of the original todo
-    @context = current_user.contexts.find(params[:todo][:context_id])
+    @context = current_user.contexts.find(params[:todo][:context_id].sub! 'c', '')
     @todo.context = @context
     @saved = @todo.save
 
diff --git a/app/helpers/todos_helper.rb b/app/helpers/todos_helper.rb
index 750ace39..6f08c9f7 100644
--- a/app/helpers/todos_helper.rb
+++ b/app/helpers/todos_helper.rb
@@ -118,6 +118,7 @@ module TodosHelper
       toggle = settings[:collapsible] ? container_toggle("toggle_#{settings[:id]}") : ""
       "#{toggle} #{settings[:title]} #{settings[:append_descriptor]}".html_safe
     end
+    header += content_tag(:div, nil, :id =>"c_"+settings[:id]+"_target", :class=>"context_target drop_target")
     header.html_safe
   end