diff --git a/src/components/LocationAutocompleteInput/LocationAutocompleteInput.js b/src/components/LocationAutocompleteInput/LocationAutocompleteInput.js
index bfb7ef86..994b6ce7 100644
--- a/src/components/LocationAutocompleteInput/LocationAutocompleteInput.js
+++ b/src/components/LocationAutocompleteInput/LocationAutocompleteInput.js
@@ -45,7 +45,7 @@ const LocationPredictionsList = props => {
   );
 };
 
-const { shape, string, arrayOf, func, any, number } = PropTypes;
+const { bool, shape, string, arrayOf, func, any, number } = PropTypes;
 
 LocationPredictionsList.defaultProps = { highlightedIndex: null };
 
@@ -269,7 +269,7 @@ class LocationAutocompleteInput extends Component {
       });
   }
   render() {
-    const { className, placeholder, input } = this.props;
+    const { autoFocus, className, placeholder, input } = this.props;
     const { name, onFocus, onBlur } = input;
     const { search, predictions } = currentValue(this.props);
 
@@ -300,6 +300,7 @@ class LocationAutocompleteInput extends Component {
           className={classNames(css.input, className)}
           type="search"
           autoComplete="off"
+          autoFocus={autoFocus}
           placeholder={placeholder}
           name={name}
           value={search}
@@ -325,9 +326,10 @@ class LocationAutocompleteInput extends Component {
   }
 }
 
-LocationAutocompleteInput.defaultProps = { className: '', placeholder: '' };
+LocationAutocompleteInput.defaultProps = { autoFocus: false, className: '', placeholder: '' };
 
 LocationAutocompleteInput.propTypes = {
+  autoFocus: bool,
   className: string,
   placeholder: string,
   input: shape({
diff --git a/src/containers/EditListingDescriptionForm/EditListingDescriptionForm.js b/src/containers/EditListingDescriptionForm/EditListingDescriptionForm.js
index b5b7beae..2ebc1f83 100644
--- a/src/containers/EditListingDescriptionForm/EditListingDescriptionForm.js
+++ b/src/containers/EditListingDescriptionForm/EditListingDescriptionForm.js
@@ -57,6 +57,7 @@ export class EditListingDescriptionFormComponent extends Component {
     return (
       <form onSubmit={handleSubmit}>
         <Field
+          autoFocus
           name="title"
           label={titleMessage}
           placeholder={titlePlaceholderMessage}
diff --git a/src/containers/EditListingDescriptionForm/__snapshots__/EditListingDescriptionForm.test.js.snap b/src/containers/EditListingDescriptionForm/__snapshots__/EditListingDescriptionForm.test.js.snap
index dd31c8d3..e30dd5fd 100644
--- a/src/containers/EditListingDescriptionForm/__snapshots__/EditListingDescriptionForm.test.js.snap
+++ b/src/containers/EditListingDescriptionForm/__snapshots__/EditListingDescriptionForm.test.js.snap
@@ -9,6 +9,7 @@ exports[`EditListingDescriptionForm matches snapshot 1`] = `
       Name of your sauna
     </label>
     <input
+      autoFocus={true}
       className=""
       name="title"
       onBlur={[Function]}
diff --git a/src/containers/EditListingLocationForm/EditListingLocationForm.js b/src/containers/EditListingLocationForm/EditListingLocationForm.js
index aba33637..c655c5a9 100644
--- a/src/containers/EditListingLocationForm/EditListingLocationForm.js
+++ b/src/containers/EditListingLocationForm/EditListingLocationForm.js
@@ -41,6 +41,7 @@ export class EditListingLocationFormComponent extends Component {
     return (
       <form onSubmit={handleSubmit}>
         <Field
+          autoFocus
           name="location"
           label={titleRequiredMessage}
           format={null}
diff --git a/src/containers/EditListingLocationForm/__snapshots__/EditListingLocationForm.test.js.snap b/src/containers/EditListingLocationForm/__snapshots__/EditListingLocationForm.test.js.snap
index 73370bea..5b823023 100644
--- a/src/containers/EditListingLocationForm/__snapshots__/EditListingLocationForm.test.js.snap
+++ b/src/containers/EditListingLocationForm/__snapshots__/EditListingLocationForm.test.js.snap
@@ -2,6 +2,7 @@ exports[`EditListingLocationForm matches snapshot 1`] = `
 <form
   onSubmit={[Function]}>
   <Field
+    autoFocus={true}
     component={[Function]}
     format={null}
     label="EditListingLocationForm.location"
diff --git a/src/containers/EditListingPricingForm/EditListingPricingForm.js b/src/containers/EditListingPricingForm/EditListingPricingForm.js
index b8b92d60..f72ae02b 100644
--- a/src/containers/EditListingPricingForm/EditListingPricingForm.js
+++ b/src/containers/EditListingPricingForm/EditListingPricingForm.js
@@ -38,6 +38,7 @@ export class EditListingPricingFormComponent extends Component {
       <form onSubmit={handleSubmit}>
         <div className={css.priceWrapper}>
           <Field
+            autoFocus
             name="price"
             component={this.EnhancedCurrencyInput}
             currencyConfig={config.currencyConfig}
diff --git a/src/containers/EditListingPricingForm/__snapshots__/EditListingPricingForm.test.js.snap b/src/containers/EditListingPricingForm/__snapshots__/EditListingPricingForm.test.js.snap
index cdebd1de..018be7dc 100644
--- a/src/containers/EditListingPricingForm/__snapshots__/EditListingPricingForm.test.js.snap
+++ b/src/containers/EditListingPricingForm/__snapshots__/EditListingPricingForm.test.js.snap
@@ -6,6 +6,7 @@ exports[`EditListingPricingForm matches snapshot 1`] = `
     <div
       className="">
       <input
+        autoFocus={true}
         className=""
         label={null}
         onBlur={[Function]}
diff --git a/src/containers/SearchForm/__snapshots__/SearchForm.test.js.snap b/src/containers/SearchForm/__snapshots__/SearchForm.test.js.snap
index 258d29e4..19087de7 100644
--- a/src/containers/SearchForm/__snapshots__/SearchForm.test.js.snap
+++ b/src/containers/SearchForm/__snapshots__/SearchForm.test.js.snap
@@ -5,6 +5,7 @@ exports[`SearchForm matches snapshot 1`] = `
     className={undefined}>
     <input
       autoComplete="off"
+      autoFocus={false}
       className=""
       name="location"
       onBlur={[Function]}