diff --git a/public/javascripts/application.js b/public/javascripts/application.js
index aff3d2f0..ee22fac9 100644
--- a/public/javascripts/application.js
+++ b/public/javascripts/application.js
@@ -337,6 +337,13 @@ $(document).ready(function() {
       $('#recurring_edit_'+this.id.split('_')[5]).show();
     });
 
+  $("#recurring_period input").live('click', function(){
+      $.each(['daily', 'weekly', 'monthly', 'yearly', 'target'], function(){
+        $('#recurring_'+this).hide();
+        });
+      $('#recurring_'+this.id.split('_')[4]).show();
+    });
+
   $('div.context span#context_name').editable(function(value, settings){
       context_id = $(this).parents('.container.context').get(0).id.split('c')[1];
       highlight = function(){
diff --git a/test/selenium/recurring_todos/switch_recurrence_options.rsel b/test/selenium/recurring_todos/switch_recurrence_options.rsel
new file mode 100644
index 00000000..073c0f9c
--- /dev/null
+++ b/test/selenium/recurring_todos/switch_recurrence_options.rsel
@@ -0,0 +1,12 @@
+setup :fixtures => :users, :clear_tables => [:projects, :contexts, :todos]
+login :as => 'admin'
+open "/recurring_todos"
+click "css=#recurring_new_container a"
+click "recurring_todo_recurring_period_daily"
+assert_visible "recurring_daily"
+click "recurring_todo_recurring_period_weekly"
+assert_visible "recurring_weekly"
+click "recurring_todo_recurring_period_monthly"
+assert_visible "recurring_monthly"
+click "recurring_todo_recurring_period_yearly"
+assert_visible "recurring_yearly"