diff --git a/plugins/woocommerce-admin/client/analytics/settings/index.js b/plugins/woocommerce-admin/client/analytics/settings/index.js
index 07211acd2d1..a078f6ac925 100644
--- a/plugins/woocommerce-admin/client/analytics/settings/index.js
+++ b/plugins/woocommerce-admin/client/analytics/settings/index.js
@@ -4,7 +4,7 @@
  */
 import { __ } from '@wordpress/i18n';
 import { Button } from '@wordpress/components';
-import { Component, Fragment, createRef } from '@wordpress/element';
+import { Component, Fragment } from '@wordpress/element';
 import { compose } from '@wordpress/compose';
 import { partial, remove, transform } from 'lodash';
 import { withDispatch } from '@wordpress/data';
@@ -12,7 +12,7 @@ import { withDispatch } from '@wordpress/data';
 /**
  * WooCommerce dependencies
  */
-import { SectionHeader, useFilters } from '@woocommerce/components';
+import { SectionHeader, useFilters, ScrollTo } from '@woocommerce/components';
 
 /**
  * Internal dependencies
@@ -39,15 +39,12 @@ class Settings extends Component {
 			isDirty: false,
 		};
 
-		this.importRef = createRef();
 		this.handleInputChange = this.handleInputChange.bind( this );
 		this.warnIfUnsavedChanges = this.warnIfUnsavedChanges.bind( this );
-		this.scrollToImport = this.scrollToImport.bind( this );
 	}
 
 	componentDidMount() {
 		window.addEventListener( 'beforeunload', this.warnIfUnsavedChanges );
-		setTimeout( this.scrollToImport, 250 );
 	}
 
 	componentWillUnmount() {
@@ -165,15 +162,8 @@ class Settings extends Component {
 		this.setState( { settings, isDirty: true } );
 	}
 
-	scrollToImport() {
-		const { query } = this.props;
-		if ( query.import === 'true' ) {
-			window.scrollTo( 0, this.importRef.current.offsetTop );
-		}
-	}
-
 	render() {
-		const { createNotice } = this.props;
+		const { createNotice, query } = this.props;
 		const { hasError } = this.state;
 		if ( hasError ) {
 			return null;
@@ -200,7 +190,7 @@ class Settings extends Component {
 						</Button>
 					</div>
 				</div>
-				<span ref={ this.importRef } />
+				{ query.import === 'true' ? <ScrollTo /> : '' }
 				<HistoricalData createNotice={ createNotice } />
 			</Fragment>
 		);
diff --git a/plugins/woocommerce-admin/packages/components/src/index.js b/plugins/woocommerce-admin/packages/components/src/index.js
index 8730b7b6ee4..baa820e9381 100644
--- a/plugins/woocommerce-admin/packages/components/src/index.js
+++ b/plugins/woocommerce-admin/packages/components/src/index.js
@@ -41,6 +41,7 @@ export { default as SearchListControl } from './search-list-control';
 export { default as SearchListItem } from './search-list-control/item';
 export { default as SectionHeader } from './section-header';
 export { default as SegmentedSelection } from './segmented-selection';
+export { default as ScrollTo } from './scroll-to';
 export { default as SimpleSelectControl } from './simple-select-control';
 export { default as SplitButton } from './split-button';
 export { default as Spinner } from './spinner';
diff --git a/plugins/woocommerce-admin/packages/components/src/scroll-to/index.js b/plugins/woocommerce-admin/packages/components/src/scroll-to/index.js
new file mode 100644
index 00000000000..07e829497e5
--- /dev/null
+++ b/plugins/woocommerce-admin/packages/components/src/scroll-to/index.js
@@ -0,0 +1,33 @@
+/** @format */
+/**
+ * External dependencies
+ */
+import { Component, createRef } from '@wordpress/element';
+
+class ScrollTo extends Component {
+	constructor() {
+		super();
+		this.scrollTo = this.scrollTo.bind( this );
+	}
+
+	componentDidMount() {
+		setTimeout( this.scrollTo, 250 );
+	}
+
+	scrollTo() {
+		if ( this.ref.current && this.ref.current.offsetTop ) {
+			window.scrollTo( 0, this.ref.current.offsetTop );
+		} else {
+			setTimeout( this.scrollTo, 250 );
+		}
+	}
+
+	render() {
+		this.ref = createRef();
+		return (
+			<span ref={ this.ref }></span>
+		);
+	}
+}
+
+export default ScrollTo;