diff --git a/app/controllers/contexts_controller.rb b/app/controllers/contexts_controller.rb
index 96c2a10b..63985245 100644
--- a/app/controllers/contexts_controller.rb
+++ b/app/controllers/contexts_controller.rb
@@ -127,7 +127,10 @@ class ContextsController < ApplicationController
     
     @context.destroy
     respond_to do |format|
-      format.js { @down_count = current_user.contexts.size }
+      format.js do
+        @down_count = current_user.contexts.size
+        update_state_counts
+      end
       format.xml { render :text => "Deleted context #{@context.name}" }
     end
   end
@@ -145,6 +148,13 @@ class ContextsController < ApplicationController
   
   protected
 
+  def update_state_counts
+    @active_contexts_count = current_user.contexts.active.count
+    @hidden_contexts_count = current_user.contexts.hidden.count
+    @show_active_contexts = @active_contexts_count > 0
+    @show_hidden_contexts = @hidden_contexts_count > 0
+  end
+
   def render_contexts_html
     lambda do
       @page_title = "TRACKS::List Contexts"
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index f20152b0..95b5e468 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -124,7 +124,15 @@ module ApplicationHelper
       {:id => "delete_project_#{project.id}", :class => "delete_project_button", :title => "#{t('projects.delete_project_title')} '#{project.name}'"}
     )
   end
-  
+
+  def link_to_delete_context(context, descriptor = sanitize(context.name))
+    link_to(
+      descriptor,
+      context_path(context, :format => 'js'),
+      {:id => "delete_context_#{context.id}", :class => "delete_context_button", :title => t('contexts.delete_context_confirmation', :name => context.name)}
+    )
+  end
+
   def link_to_project_mobile(project, accesskey, descriptor = sanitize(project.name))
     link_to( descriptor, project_path(project, :format => 'm'), {:title => "View project: #{project.name}", :accesskey => accesskey} )
   end
diff --git a/app/views/contexts/_context_listing.rhtml b/app/views/contexts/_context_listing.rhtml
index 7a2416b5..79036bcd 100644
--- a/app/views/contexts/_context_listing.rhtml
+++ b/app/views/contexts/_context_listing.rhtml
@@ -1,6 +1,6 @@
 <%  context = context_listing 
-    suppress_drag_handle ||= false
-    suppress_edit_button ||= false
+suppress_drag_handle ||= false
+suppress_edit_button ||= false
 %>
 <div id="<%= dom_id(context, "container") %>" class="list">
   <div id="<%= dom_id(context) %>" class="context sortable_row" style="display:'';">
@@ -12,23 +12,16 @@
     <div class="data">
       <%= link_to_context( context ) %> <%= " (" + count_undone_todos_phrase(context,"actions") + ")" %>
     </div>
-    
+
     <div class="buttons">
       <% if context.hide? %>
         <span class="grey"><%= t('states.hidden') %></span>
       <% else %>
         <span class="grey"><%= t('states.visible') %></span>
       <% end %>
-      <%=  link_to_remote(
-        image_tag( "blank.png", :title => t('contexts.delete_context'), :class=>"delete_item"),
-        :url => {:controller => 'contexts', :action => 'destroy', :id => context.id},
-        :method => 'delete',
-        :with => "'_source_view=#{@source_view}'",
-        :before => "$('#{dom_id(context)}').block({message:null});",
-        :complete => "$('#{dom_id(context)}').unblock();",
-        :confirm => t('contexts.delete_context_confirmation', :name => context.name),
-        :html => { :id => dom_id(context, 'delete') }
-        ) %>
+
+      <%= link_to_delete_context(context, image_tag( "blank.png", :title => t('contexts.delete_context'), :class=>"delete_item")) %>
+
       <%=  link_to_remote(
         image_tag( "blank.png", :title => t('contexts.edit_context'), :class=>"edit_item"),
         :url => {:controller => 'contexts', :action => 'edit', :id => context.id},
@@ -37,7 +30,7 @@
         :before => "$('#{dom_id(context)}').block({message:null});",
         :complete => "$('#{dom_id(context)}').unblock();",
         :html => {:id => "edit_context_#{context.id}_link"}
-        ) %>
+      ) %>
     </div>
   </div>
   <div id="<%= dom_id(context, 'edit') %>" class="edit-form" style="display:none;">
diff --git a/app/views/contexts/_context_state_group.rhtml b/app/views/contexts/_context_state_group.rhtml
index 30b41271..da0c95e1 100644
--- a/app/views/contexts/_context_state_group.rhtml
+++ b/app/views/contexts/_context_state_group.rhtml
@@ -1,5 +1,5 @@
-<div class="list-stategroup-contexts-container">
-  <h2><span id="<%= state %>-contexts-count" class="badge"><%= context_state_group.length %></span><%= t('states.'+ state +'_plural')%> <%= t('common.contexts') %></h2>
+<div class="list-stategroup-contexts-container" id="list-<%= state %>-contexts-container">
+  <h2><span id="<%= state %>-contexts-count" class="badge"><%= context_state_group.length %></span><%= t("states."+ state +"_plural")%> <%= t('common.contexts') %></h2>
   <div id="<%= state%>-contexts-empty-nd" style="<%= no_contexts ? 'display:block' : 'display:none'%>">
     <div class="message"><p><%= t('contexts.no_contexts_' + state) %></p></div>
   </div>
diff --git a/app/views/contexts/destroy.js.erb b/app/views/contexts/destroy.js.erb
new file mode 100644
index 00000000..387670fd
--- /dev/null
+++ b/app/views/contexts/destroy.js.erb
@@ -0,0 +1,15 @@
+remove_deleted_context();
+
+ContextListPage.update_all_states_count(<%=@active_contexts_count%>, <%=@hidden_contexts_count%>)
+ContextListPage.show_or_hide_all_state_containers(<%= @show_active_contexts %>, <%= @show_hidden_contexts %>);
+
+set_page_badge(<%=@down_count%>);
+page_notify('notice', "<%=  t('contexts.context_deleted', :name=>@context.name)%>", 5);
+
+
+function remove_deleted_context() {
+  $('div#<%=dom_id(@context, "container")%>').slideUp(1000,
+    function() {
+      $('div#<%=dom_id(@context, "container")%>').remove();
+    });
+}
\ No newline at end of file
diff --git a/app/views/contexts/destroy.js.rjs b/app/views/contexts/destroy.js.rjs
deleted file mode 100644
index 56c32f53..00000000
--- a/app/views/contexts/destroy.js.rjs
+++ /dev/null
@@ -1,6 +0,0 @@
-page.visual_effect :fade, dom_id(@context, "container"), :duration => 0.5
-page.delay(0.5) do
-  page[dom_id(@context, "container")].remove
-end
-page['badge_count'].replace_html @down_count
-page.notify :notice, t('contexts.context_deleted', :name=>@context.name), 5.0
diff --git a/features/context_list.feature b/features/context_list.feature
index 28ac77e3..aad38e80 100644
--- a/features/context_list.feature
+++ b/features/context_list.feature
@@ -10,14 +10,29 @@ Feature: Manage the list of contexts
       | testuser | secret   | false    |
     And I have logged in as "testuser" with password "secret"
   
-  @selenium, @wip
+  @selenium
   Scenario: Delete context from context page should update badge
     Given I have a context called "@computer"
+    And I have a context called "@ipad"
     When I go to the contexts page
-    Then the badge should show 1
+    Then the badge should show 2 
+    And the context list badge for active contexts should show 2
     When I delete the context "@computer"
     Then he should see that a context named "@computer" is not present
-    And the badge should show 0
+    And the badge should show 1
+    And the context list badge for active contexts should show 1
+
+  @selenium, @wip
+  Scenario: Delete last context from context page should remove the contexts container for hidden or active contexts
+    Given I have a context called "@computer"
+    And I have a hidden context called "@ipad"
+    When I go to the contexts page
+    When I delete the context "@computer"
+    Then I should see that a context named "@computer" is not present
+    And I should see that the context container for active contexts is not present
+    When I delete the context "@ipad"
+    Then I should see that a context named "@ipad" is not present
+    And I should see that the context container for hidden contexts is not present
 
   @selenium, @wip
   Scenario: Delete context from context page right after an edit
diff --git a/features/step_definitions/context_list_steps.rb b/features/step_definitions/context_list_steps.rb
index 6af5fea7..c0075867 100644
--- a/features/step_definitions/context_list_steps.rb
+++ b/features/step_definitions/context_list_steps.rb
@@ -36,14 +36,27 @@ When /^I add a new active context "([^"]*)"$/ do |context_name|
   When "I add a new context \"#{context_name}\""
 end
 
-
 When /^I add a new hidden context "([^"]*)"$/ do |context_name|
   fill_in "context[name]", :with => context_name
   check "context_hide"
   submit_new_context_form
 end
 
+Then /^I should see that a context named "([^"]*)" is not present$/ do |context_name|
+  Then "I should not see \"#{context_name}\""
+end
+
+Then /^I should see that the context container for (.*) contexts is not present$/ do |state|
+  present = selenium.is_element_present("list-contexts-#{state}'")
+  present.should_not be_true
+end
+
 Then /^I should see the context "([^"]*)" under "([^"]*)"$/ do |context_name, state|
   context = Context.find_by_name(context_name)
+  context.should_not be_nil
   response.should have_xpath("//div[@id='list-contexts-#{state}']//div[@id='context_#{context.id}']")
 end
+
+Then /^the context list badge for ([^"]*) contexts should show (\d+)$/ do |state_name, count|
+  selenium.get_text("xpath=//span[@id='#{state_name}-contexts-count']").should == count
+end
diff --git a/features/step_definitions/context_steps.rb b/features/step_definitions/context_steps.rb
index 0e0fae48..e34be480 100644
--- a/features/step_definitions/context_steps.rb
+++ b/features/step_definitions/context_steps.rb
@@ -3,14 +3,28 @@ Given /^I have no contexts$/ do
   Context.delete_all
 end
 
-Given /^there exists a context called "([^"]*)" for user "([^"]*)"$/ do |context_name, login|
+Given /^there exists an active context called "([^"]*)" for user "([^"]*)"$/ do |context_name, login|
   user = User.find_by_login(login)
   user.should_not be_nil
-  @context = user.contexts.create!(:name => context_name)
+  @context = user.contexts.create!(:name => context_name, :hide => false)
+end
+
+Given /^there exists a hidden context called "([^"]*)" for user "([^"]*)"$/ do |context_name, login|
+  user = User.find_by_login(login)
+  user.should_not be_nil
+  @context = user.contexts.create!(:name => context_name, :hide => true)
 end
 
 Given /^I have a context called "([^\"]*)"$/ do |context_name|
-  Given "there exists a context called \"#{context_name}\" for user \"#{@current_user.login}\""
+  Given "there exists an active context called \"#{context_name}\" for user \"#{@current_user.login}\""
+end
+
+Given /^I have an active context called "([^\"]*)"$/ do |context_name|
+  Given "there exists an active context called \"#{context_name}\" for user \"#{@current_user.login}\""
+end
+
+Given /^I have a hidden context called "([^\"]*)"$/ do |context_name|
+  Given "there exists a hidden context called \"#{context_name}\" for user \"#{@current_user.login}\""
 end
 
 Given /^I have the following contexts:$/ do |table|
diff --git a/public/javascripts/application.js b/public/javascripts/application.js
index 2dc949e6..fdfbc319 100644
--- a/public/javascripts/application.js
+++ b/public/javascripts/application.js
@@ -51,6 +51,7 @@ var TracksForm = {
     }
 }
 
+/* TODO, refactor the following two objects into three without obvious duplication */
 var ProjectListPage = {
     update_state_count: function(state, count) {
       $('#'+state+'-projects-count').html(count);
@@ -70,6 +71,26 @@ var ProjectListPage = {
     }
   }
 
+var ContextListPage = {
+    update_state_count: function(state, count) {
+      $('#'+state+'-contexts-count').html(count);
+    },
+    update_all_states_count: function (active_count, hidden_count, completed_count) {
+      $(["active", "hidden"]).each(function() { ContextListPage.update_state_count(this, eval(this+'_count')); });
+    },
+    show_or_hide_all_state_containers: function (show_active, show_hidden, show_completed) {
+      $(["active", "hidden"]).each(function() { ContextListPage.set_state_container_visibility(this, eval('show_'+this)); });
+    },
+    set_state_container_visibility: function (state, set_visible) {
+        if (set_visible) {
+            $('#list-'+state+'-contexts-container').slideDown("fast");
+        } else {
+            $('#list-'+state+'-contexts-container').slideUp("fast");
+        }
+    }
+  }
+
+
 $.fn.clearForm = function() {
   return this.each(function() {
     var type = this.type, tag = this.tagName.toLowerCase();
@@ -624,6 +645,16 @@ $(document).ready(function() {
       return false;
   });
 
+  $('a.delete_context_button').live('click', function(evt){
+      evt.preventDefault();
+      if(confirm("Are you sure that you want to "+this.title+"? Be aware that this will also delete all (repeating) actions in this context!")){
+        $(this).parents('.project').block({message: null});
+        params = {_method: 'delete'};
+        $.post(this.href, params, null, 'script');
+      }
+  });
+
+
    $("form#context-form button.positive").live('click', function (ev) {
       $('form.#context-form').ajaxSubmit({
           type: 'POST',