diff --git a/css/contacts.css b/css/contacts.css
index db536416..7906b964 100644
--- a/css/contacts.css
+++ b/css/contacts.css
@@ -7,9 +7,9 @@
 }
 #content li { cursor: default; }
 #contactsHeader input[type=checkbox] {
-	position: absolute;
-	top: 18px;
-	left: 18px;
+	margin-top: 4px;
+	margin-left: 17px;
+	margin-right: 18px;
 }
 #content input[type=radio] { 
 	width: 12px; height: 12px; 
@@ -673,11 +673,14 @@ fieldset.adr ul li input.label { margin-top: -4px !important; }
 	vertical-align: middle;
 	margin-bottom: 2px;
 }
+#contactsHeader .toggle {
+	margin: 0 15px;
+	opacity: 1;
+}
 #contactsHeader select {
 	width: auto;
 	max-width: 120px;
 	height: 22px;
-	margin-left: 50px;
 	font-weight: normal;
 	color: black;
 	border: 0;
@@ -774,12 +777,6 @@ tbody tr.contact.active, tbody tr.contact:hover {
 	position: absolute;
 	z-index: 1;
 }
-#contactlist tbody > tr > td.name > input[type=checkbox] + label, #select_all + label {
-	height: 50px;
-	position: absolute;
-	width: 50px;
-	z-index: 5;
-}
 #contactlist tbody > tr:hover > td.name > input[type=checkbox]:first-child {
 	-ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=100)"; filter:alpha(opacity=100); opacity:1;
 }
diff --git a/js/app.js b/js/app.js
index 9cca80e1..87b14eab 100644
--- a/js/app.js
+++ b/js/app.js
@@ -809,12 +809,6 @@ OC.Contacts = OC.Contacts || {
 				self.showActions(['toggle', 'add', 'download', 'groups', 'delete', 'favorite', 'merge']);
 			}
 		});
-		
-		this.$contactList.on('click', 'label', function(event) {
-			var id = $(this).attr('for');
-			$(id).prop('checked', !checkBoxes.prop('checked'));
-			return false; // Prevent opening contact
-		});
 
 		this.$sortOrder.on('change', function() {
 			$(this).blur().addClass('loading');
diff --git a/templates/contacts.php b/templates/contacts.php
index 5189f5d0..168c3c4d 100644
--- a/templates/contacts.php
+++ b/templates/contacts.php
@@ -67,8 +67,7 @@
 				<tr id="contactsHeader" class="hidden-on-load">
 					<td class="name">
 						<span class="actions_left">
-						<input type="checkbox" class="toggle" id="select_all" title="<?php p($l->t('(De-)select all')); ?>" />
-						<label for="select_all"></label>
+						<input type="checkbox" class="toggle" title="<?php p($l->t('(De-)select all')); ?>" />
 						<select class="action sort permanent" name="sort" title="<?php p($l->t('Sort order')); ?>">
 							<option value="fn"><?php p($l->t('Display name')); ?></option>
 							<option value="fl"><?php p($l->t('First- Lastname')); ?></option>
@@ -206,8 +205,7 @@
 <script id="contactListItemTemplate" type="text/template">
 	<tr class="contact" data-id="{id}" data-parent="{parent}" data-backend="{backend}">
 		<td class="name thumbnail">
-			<input type="checkbox" id="select-{id}" name="id" value="{id}" />
-			<label for="select-{id}"></label>
+			<input type="checkbox" name="id" value="{id}" />
 			<div class="avatar"></div>
 			<a href="#{id}" class="nametext">{name}</a>
 		</td>