diff --git a/css/style.scss b/css/style.scss
index b45c67375..5e98f9a1a 100644
--- a/css/style.scss
+++ b/css/style.scss
@@ -644,27 +644,34 @@ input.input-inline {
 		text-align: right;
 	}
 
-	.card-details-assigned-users {
-		display: flex;
+	.card-details-assign-users {
 
-		.assigned-user {
-			position: relative;
+		.select2 .ui-select-choices-row-inner {
+			display: flex;
+			padding: 5px !important;
+		}
 
-			.avatardiv {
-				margin-right:5px;
-			}
-			.icon-delete {
-				display: none;
-				position: absolute;
-				top: 8px;
-				left: 8px;
-			}
-			&:hover .icon-delete {
-				display: inline-block;
-				cursor: pointer;
-			}
-			&:hover .avatardiv {
-				opacity: .7;
+		.card-details-assign-users-list {
+			display: flex;
+			.assigned-user {
+				position: relative;
+
+				.avatardiv {
+					margin-right: 5px;
+				}
+				.icon-delete {
+					display: none;
+					position: absolute;
+					top: 8px;
+					left: 8px;
+				}
+				&:hover .icon-delete {
+					display: inline-block;
+					cursor: pointer;
+				}
+				&:hover .avatardiv {
+					opacity: .7;
+				}
 			}
 		}
 	}
diff --git a/templates/part.card.php b/templates/part.card.php
index d7b538b1e..809abef70 100644
--- a/templates/part.card.php
+++ b/templates/part.card.php
@@ -53,21 +53,23 @@
 		<h4><?php p($l->t('Assign users')); ?></h4>
 		<button class="button icon-add" ng-click="showAssignUser()"></button>
 	</div>
-	<ui-select id="assignUserSelect" ng-model="status.assignedUser" ng-show="status.showAssignUser" uis-open-close="assingUserOpenClose(isOpen)"
-			   theme="select2" style="width:100%;"
-			   title="Choose a user to assign" placeholder="Choose a user to assign"
-			   on-select="addAssignedUser($item)">
-		<ui-select-match placeholder="<?php p($l->t('Assign this card to a user')); ?>">
-			<span><i class="icon icon-{{$item.type}}"></i> {{ $item.participant.displayname }}</span>
-		</ui-select-match>
-		<ui-select-choices repeat="user in boardservice.getCurrent().users| filter: $select.search track by user.uid">
-			<div class="avatardiv" avatar ng-attr-displayname="{{ user.uid }}" ng-if="boardservice.id"></div><span>{{ user.displayname }}</span>
-		</ui-select-choices>
+	<div class="section-content card-details-assign-users">
+		<ui-select id="assignUserSelect" class="card-details-assign-user" ng-model="status.assignedUser" ng-show="status.showAssignUser" uis-open-close="assingUserOpenClose(isOpen)"
+				   theme="select2" style="width:100%;"
+				   title="Choose a user to assign" placeholder="Choose a user to assign"
+				   on-select="addAssignedUser($item)">
+			<ui-select-match placeholder="<?php p($l->t('Assign this card to a user')); ?>">
+				<span><i class="icon icon-{{$item.type}}"></i> {{ $item.participant.displayname }}</span>
+			</ui-select-match>
+			<ui-select-choices repeat="user in boardservice.getCurrent().users| filter: $select.search track by user.uid">
+				<div class="avatardiv" avatar ng-attr-displayname="{{ user.uid }}" ng-if="boardservice.id"></div><span>{{ user.displayname }}</span>
+			</ui-select-choices>
 	</ui-select>
-	<div class="section-content card-details-assigned-users">
-		<div class="assigned-user" ng-repeat="user in cardservice.getCurrent().assignedUsers">
-			<div class="avatardiv" avatar ng-attr-displayname="{{ user.participant.uid }}"></div>
-			<div class="icon icon-delete" ng-click="removeAssignedUser(user)"></div>
+		<div class="card-details-assign-users-list">
+			<div class="assigned-user" ng-repeat="user in cardservice.getCurrent().assignedUsers">
+				<div class="avatardiv" avatar ng-attr-displayname="{{ user.participant.uid }}"></div>
+				<div class="icon icon-delete" ng-click="removeAssignedUser(user)"></div>
+			</div>
 		</div>
 	</div>