diff --git a/addressbook/inc/class.addressbook_ui.inc.php b/addressbook/inc/class.addressbook_ui.inc.php
index f67434cd25..8279d6ba93 100644
--- a/addressbook/inc/class.addressbook_ui.inc.php
+++ b/addressbook/inc/class.addressbook_ui.inc.php
@@ -506,6 +506,11 @@ class addressbook_ui extends addressbook_bo
 					'fieldValue' => '!',	// enable if list != ''
 				),
 			);
+			if(is_subclass_of('etemplate', 'etemplate_new'))
+			{
+				$actions['lists']['children']['remove_from_list']['fieldId'] = 'filter2';
+				$actions['lists']['children']['delete_list']['fieldId'] = 'filter2';
+			}
 		}
 		// move to AB
 		if (($move2addressbooks = $this->get_addressbooks(EGW_ACL_ADD)))	// do we have addressbooks, we should
diff --git a/addressbook/js/app.js b/addressbook/js/app.js
index 31032fad22..701a1a1a92 100644
--- a/addressbook/js/app.js
+++ b/addressbook/js/app.js
@@ -185,6 +185,6 @@ function add_new_list(owner)
 			'menuaction': 'addressbook.addressbook_ui.index',
 			'add_list': name,
 			'owner': owner
-		}));
+		}), '_self');
 	}
 }