diff --git a/app/views/issues/_list.html.erb b/app/views/issues/_list.html.erb
index d704a58bbf..a774e19e63 100644
--- a/app/views/issues/_list.html.erb
+++ b/app/views/issues/_list.html.erb
@@ -31,7 +31,7 @@
     </tr>
   <% end %>
   <tr id="issue-<%= issue.id %>" class="hascontextmenu <%= cycle('odd', 'even') %> <%= issue.css_classes %> <%= level > 0 ? "idnt idnt-#{level}" : nil %>">
-    <td class="checkbox hide-when-print"><%= check_box_tag("ids[]", issue.id, false, :id => nil) %></td>
+    <td class="checkbox hide-when-print"><label><%= check_box_tag("ids[]", issue.id, false, :id => nil) %></label></td>
     <% query.inline_columns.each do |column| %>
     <%= content_tag('td', column_content(column, issue), :class => column.css_classes) %>
     <% end %>
diff --git a/app/views/timelog/_list.html.erb b/app/views/timelog/_list.html.erb
index 019ddbb53f..ae60160173 100644
--- a/app/views/timelog/_list.html.erb
+++ b/app/views/timelog/_list.html.erb
@@ -32,7 +32,7 @@
     </tr>
   <% end %>
   <tr id="time-entry-<%= entry.id %>" class="time-entry <%= cycle("odd", "even") %> hascontextmenu">
-    <td class="checkbox hide-when-print"><%= check_box_tag("ids[]", entry.id, false, :id => nil) %></td>
+    <td class="checkbox hide-when-print"><label><%= check_box_tag("ids[]", entry.id, false, :id => nil) %></label></td>
     <% @query.inline_columns.each do |column| %>
     <%= content_tag('td', column_content(column, entry), :class => column.css_classes) %>
     <% end %>
diff --git a/public/javascripts/context_menu.js b/public/javascripts/context_menu.js
index 9bc64b171a..f0269aae92 100644
--- a/public/javascripts/context_menu.js
+++ b/public/javascripts/context_menu.js
@@ -38,7 +38,7 @@ function contextMenuClick(event) {
         } else {
           tr.removeClass('context-menu-selection');
         }
-      } else {
+      } else if (target.closest('td.checkbox').length == 0) {
         if (event.ctrlKey || event.metaKey) {
           contextMenuToggleSelection(tr);
         } else if (event.shiftKey) {
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index 039cc07a9d..c04b664731 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -222,15 +222,29 @@ div + .drdn-items {border-top:1px solid #ccc;}
 #project-jump .drdn-items>a:hover {background-color:#759FCF; color:#fff !important;}
 
 /***** Tables *****/
-table.list, .table-list { border: 1px solid #e4e4e4;  border-collapse: collapse; width: 100%; margin-bottom: 4px; }
+table.list, .table-list { border: 1px solid #e4e4e4;  border-collapse: collapse; width: 100%; height: 100%; margin-bottom: 4px; }
 table.list th, .table-list-header { background-color:#EEEEEE; padding: 4px; white-space:nowrap; font-weight:bold; }
 table.list td {text-align:center; vertical-align:middle; padding-right:10px;}
 table.list td.id { width: 2%; text-align: center;}
 table.list td.name, table.list td.description, table.list td.subject, table.list td.comments, table.list td.roles, table.list td.attachments {text-align: left;}
 table.list td.attachments a {display:block;}
 table.list td.tick {width:15%}
-table.list td.checkbox { width: 15px; padding: 2px 0 0 0; }
-table.list td.checkbox input {padding:0px;}
+table.list td.checkbox { width: 15px; height: 100%; padding: 2px 0 0 0; }
+table.list td.checkbox input { padding: 0px; }
+table.list td.checkbox label {
+  height: 100%;
+  width: 100%;
+  display: block;
+  position: relative;
+}
+table.list td.checkbox label input {
+  position: absolute;
+  top: 0;
+  bottom: 0;
+  left: 0;
+  right: 0;
+  margin: auto;
+}
 table.list td.buttons, div.buttons { white-space:nowrap; text-align: right; }
 table.list td.buttons a, div.buttons a { margin-right: 0.6em; }
 table.list td.buttons a:last-child, div.buttons a:last-child { margin-right: 0; }