diff --git a/dev/Common/Selector.js b/dev/Common/Selector.js
index 936abc992..340feca15 100644
--- a/dev/Common/Selector.js
+++ b/dev/Common/Selector.js
@@ -21,15 +21,13 @@ export class Selector {
 	 * @param {koProperty} koFocusedItem
 	 * @param {string} sItemSelector
 	 * @param {string} sItemCheckedSelector
-	 * @param {string} sItemFocusedSelector
 	 */
 	constructor(
 		koList,
 		koSelectedItem,
 		koFocusedItem,
 		sItemSelector,
-		sItemCheckedSelector,
-		sItemFocusedSelector
+		sItemCheckedSelector
 	) {
 		koFocusedItem = (koFocusedItem || ko.observable(null)).extend({ toggleSubscribeProperty: [this, 'focused'] });
 		koSelectedItem = (koSelectedItem || ko.observable(null)).extend({ toggleSubscribeProperty: [null, 'selected'] });
@@ -46,7 +44,7 @@ export class Selector {
 
 		this.sItemSelector = sItemSelector;
 		this.sItemCheckedSelector = sItemCheckedSelector;
-		this.sItemFocusedSelector = sItemFocusedSelector;
+		this.sItemFocusedSelector = sItemSelector + '.focused';
 
 		this.sLastUid = '';
 		this.oCallbacks = {};
diff --git a/dev/View/Popup/Contacts.js b/dev/View/Popup/Contacts.js
index a3f667e45..4c8949978 100644
--- a/dev/View/Popup/Contacts.js
+++ b/dev/View/Popup/Contacts.js
@@ -56,9 +56,8 @@ export class ContactsPopupView extends AbstractViewPopup {
 			ContactUserStore,
 			this.selectorContact,
 			null,
-			'.e-contact-item .actionHandle',
-			'.e-contact-item .checkboxItem',
-			'.e-contact-item.focused'
+			'.e-contact-item',
+			'.e-contact-item .checkboxItem'
 		);
 
 		this.selector.on('ItemSelect', contact => this.populateViewContact(contact));
diff --git a/dev/View/User/MailBox/MessageList.js b/dev/View/User/MailBox/MessageList.js
index 88e8c9551..2784b0090 100644
--- a/dev/View/User/MailBox/MessageList.js
+++ b/dev/View/User/MailBox/MessageList.js
@@ -220,8 +220,7 @@ export class MailMessageList extends AbstractViewRight {
 			MessagelistUserStore.selectedMessage,
 			MessagelistUserStore.focusedMessage,
 			'.messageListItem',
-			'.messageListItem .messageCheckbox',
-			'.messageListItem.focused'
+			'.messageListItem .messageCheckbox'
 		);
 
 		this.selector.on('ItemSelect', message => {
@@ -614,7 +613,7 @@ export class MailMessageList extends AbstractViewRight {
 				eqs(event, '.checkboxCheckAll') && this.checkAll(!this.checkAll());
 			},
 			dblclick: event => {
-				let el = eqs(event, '.actionHandle');
+				let el = eqs(event, '.messageListItem');
 				el && this.gotoThread(ko.dataFor(el));
 			}
 		});
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/PopupsContacts.html b/snappymail/v/0.0.0/app/templates/Views/User/PopupsContacts.html
index bc6381caf..6a0a5bc32 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/PopupsContacts.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/PopupsContacts.html
@@ -63,7 +63,7 @@
 				<div class="e-contact-foreach g-ui-user-select-none" data-bind="foreach: contacts, visible: contacts().length">
 					<div class="e-contact-item g-ui-user-select-none" data-bind="css: lineAsCss()">
 						<div class="checkboxItem fontastic" data-bind="text: checked() ? '☑' : '☐'"></div>
-						<div class="nameParent actionHandle" data-bind="text: display"></div>
+						<div class="nameParent" data-bind="text: display"></div>
 					</div>
 				</div>
 			</div>