diff --git a/apps/files/templates/fileexists.html b/apps/files/templates/fileexists.html
index 5360a7c8e8..c783f9a05c 100644
--- a/apps/files/templates/fileexists.html
+++ b/apps/files/templates/fileexists.html
@@ -3,24 +3,28 @@
 	<span class="what">{what}<!-- If you select both versions, the copied file will have a number added to its name. --></span><br/>
 	<br/>
 	<table>
-		<th><label><input class="allnewfiles" type="checkbox" />{allnewfiles}<span class="count"></span></label></th>
-		<th><label><input class="allexistingfiles" type="checkbox" />{allexistingfiles}<span class="count"></span></label></th>
+		<th><input id="checkbox-allnewfiles" class="allnewfiles" type="checkbox" /><label for="checkbox-allnewfiles">{allnewfiles}<span class="count"></span></label></th>
+		<th><input id="checkbox-allexistingfiles" class="allexistingfiles" type="checkbox" /><label for="checkbox-allexistingfiles">{allexistingfiles}<span class="count"></span></label></th>
 	</table>
 	<div class="conflicts">
 		<div class="template">
 			<div class="filename"></div>
 			<div class="replacement">
-				<input type="checkbox" />
+				<input type="checkbox" class="u-left"/>
+				<label>
 				<span class="svg icon"></span>
 				<div class="mtime"></div>
 				<div class="size"></div>
+				</label>
 			</div>
 			<div class="original">
-				<input type="checkbox" />
+				<input type="checkbox" class="u-left" />
+				<label>
 				<span class="svg icon"></span>
 				<div class="mtime"></div>
 				<div class="size"></div>
 				<div class="message"></div>
+				</label>
 			</div>
 		</div>
 	</div>
diff --git a/core/css/styles.css b/core/css/styles.css
index 2ec5129a1c..bc4db43301 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -178,6 +178,8 @@ input[type="checkbox"] + label:before {
 	opacity: 0.7;
 }
 
+input[type="checkbox"].u-left +label:before { float: left; }
+
 input[type="checkbox"].white + label:before {
 	background-image: url('../img/actions/checkbox-white.svg');
 }
diff --git a/core/js/oc-dialogs.js b/core/js/oc-dialogs.js
index 52ed34f61e..719ac8587a 100644
--- a/core/js/oc-dialogs.js
+++ b/core/js/oc-dialogs.js
@@ -400,6 +400,11 @@ var OCdialogs = {
 					$replacementDiv.find('.icon').css('background-image','url(' + path + ')');
 				}
 			);
+			// connect checkboxes with labels
+			var checkboxId = $conflicts.find('.conflict').length;
+			$originalDiv.find('input:checkbox').attr('id', 'checkbox_original_'+checkboxId);
+			$replacementDiv.find('input:checkbox').attr('id', 'checkbox_replacement_'+checkboxId);
+
 			$conflicts.append($conflict);
 
 			//set more recent mtime bold