diff --git a/DNN Platform/Website/Resources/Shared/components/CountriesRegions/dnn.CountriesRegions.js b/DNN Platform/Website/Resources/Shared/components/CountriesRegions/dnn.CountriesRegions.js
index ef3625011d7..58b98082f7e 100644
--- a/DNN Platform/Website/Resources/Shared/components/CountriesRegions/dnn.CountriesRegions.js	
+++ b/DNN Platform/Website/Resources/Shared/components/CountriesRegions/dnn.CountriesRegions.js	
@@ -116,7 +116,13 @@ function setupCountryAutoComplete() {
 			} else {
 				clearCountryValue(this);
 			}
-		}
+        },
+        focus: function (event, ui) {
+            event.preventDefault();
+            this.value = ui.item.name;
+            $(this).attr('data-value', ui.item.id);
+            $(this).attr('data-text', ui.item.name);
+        }
 	});
 	$('input[data-editor="DnnCountryAutocompleteControl"]').change(function () {
 		if ($(this).val().length < 2) {