diff --git a/UI/Templates/ContactsUI/UIxContactsListView.wox b/UI/Templates/ContactsUI/UIxContactsListView.wox
index 9b34236a4..2bb4fffca 100644
--- a/UI/Templates/ContactsUI/UIxContactsListView.wox
+++ b/UI/Templates/ContactsUI/UIxContactsListView.wox
@@ -7,6 +7,7 @@
     xmlns:label="OGo:label"
     xmlns:rsrc="OGo:url"
     className="UIxContactsListViewContainer"
+    selectorComponentClass="selectorComponentClass"
     title="name"
     var:popup="isPopup"
     >
diff --git a/UI/Templates/ContactsUI/UIxContactsListViewContainer.wox b/UI/Templates/ContactsUI/UIxContactsListViewContainer.wox
index 6c0cd98b1..5548ec7a0 100644
--- a/UI/Templates/ContactsUI/UIxContactsListViewContainer.wox
+++ b/UI/Templates/ContactsUI/UIxContactsListViewContainer.wox
@@ -51,7 +51,7 @@
 
       <form name="searchform" var:href="view" var:_sort="sortKey"
         onsubmit="return onSearchFormSubmit();" method="GET">
-	<var:if condition="isPopup" const:negate="YES">
+<!--	var:if condition="isPopup" const:negate="YES"> -->
           <var:if condition="hideFolderTree" const:negate="YES">
             <div class="contactFoldersList" id="contactFoldersList">
               <div class="titlediv"><var:string label:value="Address Books" /></div>
@@ -106,10 +106,16 @@
             <div id="contactView" onmousedown="return false;"
               ></div>
           </div>
-        </var:if>
+<!--          /var:if> -->
 
-	<var:if condition="isPopup">
-          <var:component-content />
+<!--	var:if condition="isPopup">
+          var:component-content />
+        /var:if> -->
+
+        <var:if condition="hasContactSelectionButtons">
+          <div class="contactSelection">
+            <var:component value="selectorComponent" />
+          </div>
         </var:if>
       </form>