diff --git a/addons/base/static/src/js/form.js b/addons/base/static/src/js/form.js
index bf3c806140a..33c855af537 100644
--- a/addons/base/static/src/js/form.js
+++ b/addons/base/static/src/js/form.js
@@ -962,9 +962,9 @@ openerp.base.form.Many2ManyListView = openerp.base.ListView.extend({
     },
     do_add_record: function (e) {
         e.stopImmediatePropagation();
-        debugger;
         var pop = new openerp.base.form.Many2XSelectPopup(null, this.m2m_field.view.session);
-        pop.select_element(null,null);
+        pop.select_element(this.model);
+        //TODO niv: add callback
     },
     on_select_row: function(event) {
         var $target = $(event.currentTarget);
@@ -989,14 +989,33 @@ openerp.base.form.Many2ManyListView = openerp.base.ListView.extend({
 openerp.base.form.Many2XSelectPopup = openerp.base.BaseWidget.extend({
     identifier_prefix: "many2xselectpopup",
     template: "Many2XSelectPopup",
-    select_element: function(model, callback) {
+    select_element: function(model) {
         this.model = model;
-        this.callback = callback;
         var html = this.render();
         jQuery(html).dialog({title: '',
                     modal: true,
                     minWidth: 800});
         this.start();
+    },
+    start: function() {
+        this.dataset = new openerp.base.DataSetSearch(this.session, this.model);
+        this.setup_search_view();
+    },
+    setup_search_view: function() {
+        var self = this;
+        if (this.searchview) {
+            this.searchview.stop();
+        }
+        this.searchview = new openerp.base.SearchView(this, this.session, this.element_id + "_search",
+                this.dataset, false, {});
+        /*this.searchview.on_search.add(function(domains, contexts, groupbys) {
+            //TODO niv: do it correctly
+            self.views[self.active_view].controller.do_search.call(
+                self, domains, contexts, groupbys);
+        });*/
+        return this.searchview.start();
+    },
+    on_select_element: function(element_id) {
     }
 });
 
diff --git a/addons/base/static/src/xml/base.xml b/addons/base/static/src/xml/base.xml
index 7df230f3d3e..84528b75e9b 100644
--- a/addons/base/static/src/xml/base.xml
+++ b/addons/base/static/src/xml/base.xml
@@ -491,7 +491,8 @@
         <t t-set="expand" t-value="false"/>
         <t t-set="label" t-value="'Custom Filters'"/>
         <t t-set="content">
-            <div class="searchview_extended_groups_list"/>
+            <div class="searchview_extended_groups_list">
+            </div>
             <button class="searchview_extended_add_group"
                     type="button">Add group of conditions</button>
         </t>
@@ -572,8 +573,8 @@
     </div>
 </t>
 <t t-name="Many2XSelectPopup">
-    <div id="element_id">
-        Brian is in the kitchen.
+    <div t-att-id="element_id">
+        <div t-att-id="element_id + '_search'"></div>
     </div>
 </t>
 </templates>