diff --git a/view/css/widgets.css b/view/css/widgets.css
index 5176c6934..cb976e166 100644
--- a/view/css/widgets.css
+++ b/view/css/widgets.css
@@ -81,10 +81,16 @@
 
 
 /* group */
+input.group-edit-checkbox {
+	margin: unset;
+}
+
+a.group-edit-link {
+	z-index: 1;
+}
 
 .group-edit-icon {
 	opacity: 0;
-	z-index: 1;
 }
 
 li:hover .group-edit-icon {
diff --git a/view/tpl/group_side.tpl b/view/tpl/group_side.tpl
index 3701f979e..6c5edba27 100755
--- a/view/tpl/group_side.tpl
+++ b/view/tpl/group_side.tpl
@@ -5,14 +5,16 @@
 			{{foreach $groups as $group}}
 			<li>
 				{{if $group.cid}}
-				<input type="checkbox" 
-					class="{{if $group.selected}}ticked{{else}}unticked {{/if}} action" 
-					onclick="contactgroupChangeMember('{{$group.id}}','{{$group.enc_cid}}');return true;"
-					{{if $group.ismember}}checked="checked"{{/if}}
-				/>
+				<a class="pull-right group-edit-link">
+					<input type="checkbox" 
+						class="{{if $group.selected}}ticked{{else}}unticked {{/if}} group-edit-checkbox" 
+						onclick="contactgroupChangeMember('{{$group.id}}','{{$group.enc_cid}}');return true;"
+						{{if $group.ismember}}checked="checked"{{/if}}
+					/>
+				</a>
 				{{/if}}
 				{{if $group.edit}}
-				<a class="pull-right group-edit-icon" href="{{$group.edit.href}}" title="{{$edittext}}"><i class="icon-pencil"></i></a>
+				<a class="pull-right group-edit-link" href="{{$group.edit.href}}" title="{{$edittext}}"><i class="group-edit-icon icon-pencil"></i></a>
 				{{/if}}
 				<a{{if $group.selected}} class="group-selected"{{/if}} href="{{$group.href}}">{{$group.text}}</a>
 			</li>