diff --git a/addressbook/templates/default/app.css b/addressbook/templates/default/app.css
index 87ee32eb73..108b2c05ba 100644
--- a/addressbook/templates/default/app.css
+++ b/addressbook/templates/default/app.css
@@ -119,4 +119,6 @@ select#addressbook-index_col_filter\[tid\] {
 	float: right;
 	width: 134px;
 }
-#addressbook-edit .chzn-container .chzn-results {max-height: 110px}
\ No newline at end of file
+#addressbook-edit .chzn-container .chzn-results {max-height: 110px}
+
+#addressbook-index_nm .chzn-drop {width:auto;}
\ No newline at end of file
diff --git a/addressbook/templates/default/index.xet b/addressbook/templates/default/index.xet
index d5cdcc6e3b..07fd513652 100644
--- a/addressbook/templates/default/index.xet
+++ b/addressbook/templates/default/index.xet
@@ -62,12 +62,12 @@
 					<nextmatch-header label="Birthday" id="bday"/>
 					<vbox>
 						<nextmatch-header label="Business address" id="business"/>
-						<nextmatch-customfilter id="adr_one_countrycode" options="select-country" empty_label="Country" class="countrySelect"/>
+						<nextmatch-customfilter id="adr_one_countrycode" options="select-country" type="select-country" width="100px" tags="true" empty_label="Country" class="countrySelect"/>
 						<nextmatch-sortheader label="zip code" id="adr_one_postalcode"/>
 					</vbox>
 					<vbox>
 						<nextmatch-header label="Home address" id="home"/>
-						<nextmatch-customfilter id="adr_two_countrycode" options="select-country" empty_label="Country" class="countrySelect"/>
+						<nextmatch-customfilter id="adr_two_countrycode" options="select-country" type="select-country" tags="true" empty_label="Country" class="countrySelect"/>
 						<nextmatch-sortheader label="zip code" id="adr_two_postalcode"/>
 					</vbox>
 					<vbox>
diff --git a/addressbook/templates/pixelegg/app.css b/addressbook/templates/pixelegg/app.css
index dfa0cd3a25..4f85f58ea7 100755
--- a/addressbook/templates/pixelegg/app.css
+++ b/addressbook/templates/pixelegg/app.css
@@ -143,6 +143,9 @@ select#addressbook-index_col_filter\[tid\] {
 #addressbook-edit .chzn-container .chzn-results {
   max-height: 110px;
 }
+#addressbook-index_nm .chzn-drop {
+  width: auto;
+}
 @media all {
   /* #############################################################################