diff --git a/app/views/todos/_edit_mobile.rhtml b/app/views/todos/_edit_mobile.rhtml
index f1caa191..0837f026 100644
--- a/app/views/todos/_edit_mobile.rhtml
+++ b/app/views/todos/_edit_mobile.rhtml
@@ -33,8 +33,8 @@ end %>
 <h2><label for="tag_list">Tags (separate with commas)</label></h2>
 <%= text_field_tag "tag_list", @tag_list_text, :size => 30, :tabindex => 6 %> 
 <h2><label for="todo_due">Due</label></h2>
-<%= date_select("todo", "due", :order => [:day, :month, :year],
-                    :start_year => this_year, :include_blank => true) %>
+<%= date_select("todo", "due", {:order => [:day, :month, :year],
+                    :start_year => this_year, :include_blank => true}, :tabindex => 7) %>
 <h2><label for="todo_show_from">Show from</label></h2>
-<%= date_select("todo", "show_from", :order => [:day, :month, :year], 
-                    :start_year => this_year, :include_blank => true) %>
+<%= date_select("todo", "show_from", {:order => [:day, :month, :year], 
+                    :start_year => this_year, :include_blank => true}, :tabindex => 8) %>
diff --git a/app/views/todos/new.m.erb b/app/views/todos/new.m.erb
index 2dfe0fd7..361e223d 100644
--- a/app/views/todos/new.m.erb
+++ b/app/views/todos/new.m.erb
@@ -1,5 +1,5 @@
 <% form_tag formatted_todos_path(:m), :method => :post do %>
   <%= render :partial => 'edit_mobile' %>
-  <p><input type="submit" value="Create" tabindex="6" accesskey="#" /></p>
+  <p><input type="submit" value="Create" tabindex="12" accesskey="#" /></p>
 <% end -%>
 <%= link_to "Back", @return_path %>
\ No newline at end of file