diff --git a/resources/views/clients/edit.blade.php b/resources/views/clients/edit.blade.php
index 04fae6756d6d..15725564549f 100644
--- a/resources/views/clients/edit.blade.php
+++ b/resources/views/clients/edit.blade.php
@@ -94,7 +94,7 @@
 						{!! Former::text('city') !!}
 						{!! Former::text('state') !!}
 						{!! Former::text('postal_code')
-								->onchange(config('ninja.google_maps_api_key') ? 'lookupPostalCode()' : '') !!}
+								->oninput(config('ninja.google_maps_api_key') ? 'lookupPostalCode()' : '') !!}
 						{!! Former::select('country_id')->addOption('','')
 							->fromQuery($countries, 'name', 'id') !!}
 
@@ -112,7 +112,7 @@
 						{!! Former::text('shipping_city')->label('city') !!}
 						{!! Former::text('shipping_state')->label('state') !!}
 						{!! Former::text('shipping_postal_code')
-								->onchange(config('ninja.google_maps_api_key') ? 'lookupPostalCode(true)' : '')
+								->oninput(config('ninja.google_maps_api_key') ? 'lookupPostalCode(true)' : '')
 								->label('postal_code') !!}
 						{!! Former::select('shipping_country_id')->addOption('','')
 							->fromQuery($countries, 'name', 'id')->label('country_id') !!}
diff --git a/resources/views/partials/google_geocode.blade.php b/resources/views/partials/google_geocode.blade.php
index 8af6593900fd..bcf41e175a87 100644
--- a/resources/views/partials/google_geocode.blade.php
+++ b/resources/views/partials/google_geocode.blade.php
@@ -64,10 +64,12 @@ function lookupPostalCode(isShipping) {
     var countryId = $('#' + countryField).val() || {{ $account->getCountryId() }};
     var countryCode = countryMap[countryId].iso_3166_2;
 
-    if (! postalCode) {
+    if (! postalCode || postalCode.length < 5) {
         return;
     }
 
+    $('#' + cityField).attr('placeholder', {!! json_encode(trans('texts.loading') . '...') !!});
+
     var geocoder = new google.maps.Geocoder;
     geocoder.geocode({
         componentRestrictions: {
@@ -97,8 +99,9 @@ function lookupPostalCode(isShipping) {
                     }
                 }
             }
+            $('#' + cityField).attr('placeholder', '');
         } else {
-            $('#' + cityField).attr("placeholder", {!! json_encode(trans('texts.no_match_found')) !!});
+            $('#' + cityField).attr('placeholder', {!! json_encode(trans('texts.no_match_found')) !!});
         }
         showGeocodePlaceholder(isShipping);
     });
diff --git a/resources/views/vendors/edit.blade.php b/resources/views/vendors/edit.blade.php
index 3628d18c100a..b204a454f631 100644
--- a/resources/views/vendors/edit.blade.php
+++ b/resources/views/vendors/edit.blade.php
@@ -65,7 +65,7 @@
 			{!! Former::text('state') !!}
 
 			{!! Former::text('postal_code')
-					->onchange(config('ninja.google_maps_api_key') ? 'lookupPostalCode()' : '') !!}
+					->oninput(config('ninja.google_maps_api_key') ? 'lookupPostalCode()' : '') !!}
 			{!! Former::select('country_id')->addOption('','')
 				->fromQuery($countries, 'name', 'id') !!}