diff --git a/app/views/projects/activity.rhtml b/app/views/projects/activity.rhtml
index b4c1d9a..604b9f7 100644
--- a/app/views/projects/activity.rhtml
+++ b/app/views/projects/activity.rhtml
@@ -63,7 +63,7 @@
 <% form_tag do %>
 <h3><%= l(:label_activity) %></h3>
 <p><% @event_types.each do |t| %>
-<%= check_box_tag "show_#{t}", 1, @scope.include?(t) %> <%= l("label_#{t.singularize}_plural")%><br />
+<label><%= check_box_tag "show_#{t}", 1, @scope.include?(t) %> <%= l("label_#{t.singularize}_plural")%></label><br />
 <% end %></p>
 <p><%= submit_tag l(:button_apply), :class => 'button-small' %></p>
 <% end %>
diff --git a/app/views/projects/calendar.rhtml b/app/views/projects/calendar.rhtml
index b09d059..ad022f3 100644
--- a/app/views/projects/calendar.rhtml
+++ b/app/views/projects/calendar.rhtml
@@ -78,10 +78,10 @@ end %>
     <%= select_year(@year, :prefix => "year", :discard_type => true) %></p>
     
     <% @trackers.each do |tracker| %>
-      <%= check_box_tag "tracker_ids[]", tracker.id, (@selected_tracker_ids.include? tracker.id.to_s) %> <%= tracker.name %><br />
+      <label><%= check_box_tag "tracker_ids[]", tracker.id, (@selected_tracker_ids.include? tracker.id.to_s) %> <%= tracker.name %></label><br />
     <% end %>
     <% if @project.active_children.any? %>
-    <br /><%= check_box_tag "with_subprojects", 1, params[:with_subprojects] %> <%=l(:label_subproject_plural)%>
+    <br /><label><%= check_box_tag "with_subprojects", 1, params[:with_subprojects] %> <%=l(:label_subproject_plural)%></label>
     <% end %>
     <p><%= submit_tag l(:button_apply), :class => 'button-small' %></p>
     <% end %>
diff --git a/app/views/projects/changelog.rhtml b/app/views/projects/changelog.rhtml
index 61ca54a..e4d32a3 100644
--- a/app/views/projects/changelog.rhtml
+++ b/app/views/projects/changelog.rhtml
@@ -29,8 +29,8 @@
 <% form_tag do %>
 <h3><%= l(:label_change_log) %></h3>
 <% @trackers.each do |tracker| %>
-  <%= check_box_tag "tracker_ids[]", tracker.id, (@selected_tracker_ids.include? tracker.id.to_s) %>
-  <%= tracker.name %><br />
+  <label><%= check_box_tag "tracker_ids[]", tracker.id, (@selected_tracker_ids.include? tracker.id.to_s) %>
+  <%= tracker.name %></label><br />
 <% end %>
 <p><%= submit_tag l(:button_apply), :class => 'button-small' %></p>
 <% end %>
diff --git a/app/views/projects/gantt.rhtml b/app/views/projects/gantt.rhtml
index dbf95d3..d3b3167 100644
--- a/app/views/projects/gantt.rhtml
+++ b/app/views/projects/gantt.rhtml
@@ -237,10 +237,10 @@ if Date.today >= @date_from and Date.today <= @date_to %>
     <h3><%= l(:label_gantt) %></h3>
     <% form_tag(params.merge(:tracker_ids => nil, :with_subprojects => nil)) do %>
     <% @trackers.each do |tracker| %>
-      <%= check_box_tag "tracker_ids[]", tracker.id, (@selected_tracker_ids.include? tracker.id.to_s) %> <%= tracker.name %><br />
+      <label><%= check_box_tag "tracker_ids[]", tracker.id, (@selected_tracker_ids.include? tracker.id.to_s) %> <%= tracker.name %></label><br />
     <% end %>
     <% if @project.active_children.any? %>
-    <br /><%= check_box_tag "with_subprojects", 1, params[:with_subprojects] %> <%=l(:label_subproject_plural)%>
+    <br /><label><%= check_box_tag "with_subprojects", 1, params[:with_subprojects] %> <%=l(:label_subproject_plural)%></label>
     <% end %>
     <p><%= submit_tag l(:button_apply), :class => 'button-small' %></p>
     <% end %>
diff --git a/app/views/projects/roadmap.rhtml b/app/views/projects/roadmap.rhtml
index c370e5a..8d68165 100644
--- a/app/views/projects/roadmap.rhtml
+++ b/app/views/projects/roadmap.rhtml
@@ -58,8 +58,8 @@
 <% form_tag do %>
 <h3><%= l(:label_roadmap) %></h3>
 <% @trackers.each do |tracker| %>
-  <%= check_box_tag "tracker_ids[]", tracker.id, (@selected_tracker_ids.include? tracker.id.to_s) %>
-  <%= tracker.name %><br />
+  <label><%= check_box_tag "tracker_ids[]", tracker.id, (@selected_tracker_ids.include? tracker.id.to_s) %>
+  <%= tracker.name %></label><br />
 <% end %>
 <br />
 <label for="completed"><%= check_box_tag "completed", 1, params[:completed] %> <%= l(:label_show_completed_versions) %>