diff --git a/dev/Styles/User/SettingsFolders.less b/dev/Styles/User/SettingsFolders.less
index fe6b7b276..1025dceb6 100644
--- a/dev/Styles/User/SettingsFolders.less
+++ b/dev/Styles/User/SettingsFolders.less
@@ -9,13 +9,16 @@
 		margin-top: 1em;
 	}
 
+	td:first-child {
+		cursor: pointer;
+	}
+
 	td + td {
 		white-space: nowrap;
 		width: 1em;
 	}
 
 	.folder-name {
-		cursor: pointer;
 		word-break: break-all;
 		white-space: pre-wrap;
 	}
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/SettingsFolderItem.html b/snappymail/v/0.0.0/app/templates/Views/User/SettingsFolderItem.html
index 6f14c7c44..4dbbac6ed 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/SettingsFolderItem.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/SettingsFolderItem.html
@@ -1,6 +1,6 @@
 <tr data-bind="css: { 'selectable': selectable, 'system': isSystemFolder }">
-	<td data-bind="css: 'deep-' + deep">
-		<span class="folder-name" data-bind="text: name, click: edit, tooltipErrorTip: errorMsg"></span>
+	<td data-bind="click: edit, css: 'deep-' + deep">
+		<span class="folder-name" data-bind="text: name, tooltipErrorTip: errorMsg"></span>
 		<span class="folder-system-name" data-bind="text: nameInfo, visible: isSystemFolder"></span>
 		<span class="folder-size" data-bind="text: friendlySize, visible: size"></span>
 	</td>