diff --git a/app/assets/javascripts/tracks.js b/app/assets/javascripts/tracks.js
index dcd5dfc7..37b42cee 100644
--- a/app/assets/javascripts/tracks.js
+++ b/app/assets/javascripts/tracks.js
@@ -854,6 +854,15 @@ var ContextListPage = {
             return false;
         });
 
+        /* cancel edit context form */
+        $(document).on("click",'form.edit-context-form a.negative', function(){
+            $(this).parents('.edit-form').fadeOut(200, function () {
+                $(this).parents('.context-edit-current').removeClass('context-edit-current');
+                $(this).parents('.list').find('.context').fadeIn(500);
+                $(this).parents('.container').find('.item-show').fadeIn(500);
+            });
+        });
+
         /* Contexts behavior */
         $('#toggle_context_new').click(function(evt){
             TracksForm.toggle('toggle_context_new', 'context_new', 'context-form',
@@ -862,7 +871,7 @@ var ContextListPage = {
         });
 
         /* make the two state lists of context sortable */
-        $(['active', 'hidden']).each(function() {
+        $(['active', 'hidden', 'closed']).each(function() {
             $("#list-contexts-"+this).sortable({
                 handle: '.grip',
                 update: update_order
diff --git a/app/views/contexts/_context_form.html.erb b/app/views/contexts/_context_form.html.erb
index 996c9197..35648f60 100644
--- a/app/views/contexts/_context_form.html.erb
+++ b/app/views/contexts/_context_form.html.erb
@@ -3,7 +3,7 @@
 
 <%= form_for(context, :html => {
     :id => dom_id(context, 'edit_form'),
-    :class => "inline-form edit-project-form",
+    :class => "inline-form edit-context-form",
     :method => :put }) do
   -%>
 
diff --git a/config/locales/en.yml b/config/locales/en.yml
index ed42c4dc..3db028c5 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -620,6 +620,8 @@ en:
     completed_plural: Completed
     visible_plural: Visible
     visible: Visible
+    close: Closed
+    closed_plural: Closed
     active_plural: Active
     hidden: Hidden
     active: Active