diff --git a/client/my-sites/themes/style.scss b/client/my-sites/themes/style.scss
index 2104bd10e3bba..fe6c1ae45e187 100644
--- a/client/my-sites/themes/style.scss
+++ b/client/my-sites/themes/style.scss
@@ -1,7 +1,7 @@
 .themes-thanks-modal  {
 	width: 300px;
 	padding: 1.5em;
-	min-height: 245px;
+	min-height: 285px;
 
 	@include breakpoint( "<480px" ) {
 		box-sizing: border-box;
diff --git a/client/my-sites/themes/thanks-modal.jsx b/client/my-sites/themes/thanks-modal.jsx
index 571b1bed8d979..cf7d04dd31016 100644
--- a/client/my-sites/themes/thanks-modal.jsx
+++ b/client/my-sites/themes/thanks-modal.jsx
@@ -19,6 +19,7 @@ import {
 	getThemeDetailsUrl,
 	getThemeCustomizeUrl,
 	getThemeForumUrl,
+	getThemeSetupUrl,
 	isActivatingTheme,
 	hasActivatedTheme
 } from 'state/themes/selectors';
@@ -63,6 +64,12 @@ const ThanksModal = React.createClass( {
 	},
 
 	renderWpcomInfo() {
+		const themeSetup = translate( 'Make your site look like the demo with {{a}}Theme Setup{{/a}}.', {
+			components: {
+				a: <a href={ this.props.themeSetupUrl }
+					onClick={ this.onLinkClick( 'setup' ) } />
+			}
+		} );
 		const features = translate( "Discover this theme's {{a}}awesome features.{{/a}}", {
 			components: {
 				a: <a href={ this.props.detailsUrl }
@@ -77,6 +84,9 @@ const ThanksModal = React.createClass( {
 		} );
 		return (
 			<ul>
+				<li>
+					{ themeSetup }
+				</li>
 				<li>
 					{ this.props.source === 'list' ? features : customize }
 				</li>
@@ -208,6 +218,7 @@ export default connect(
 
 		return {
 			currentTheme,
+			themeSetupUrl: site && getThemeSetupUrl( state, site.ID ),
 			detailsUrl: site && getThemeDetailsUrl( state, currentTheme, site.ID ),
 			customizeUrl: site && getThemeCustomizeUrl( state, currentTheme, site.ID ),
 			forumUrl: getThemeForumUrl( state, currentThemeId ),
diff --git a/client/state/themes/selectors.js b/client/state/themes/selectors.js
index 9f481d467e14e..d446d2fcc660a 100644
--- a/client/state/themes/selectors.js
+++ b/client/state/themes/selectors.js
@@ -415,6 +415,21 @@ export function getThemeCustomizeUrl( state, theme, siteId ) {
 	return customizeUrl;
 }
 
+/**
+ * Returns the URL for running Theme Setup on the current site (Headstart on demand).
+ *
+ * @param  {Object}  state   Global state tree
+ * @param  {Object}  siteId  Site ID
+ * @return {String}          Theme Setup URL
+ */
+export function getThemeSetupUrl( state, siteId ) {
+	if ( ! siteId ) {
+		return '/settings/theme-setup/';
+	}
+	const siteSlug = getSiteSlug( state, siteId );
+	return '/settings/theme-setup/' + siteSlug;
+}
+
 /**
  * Returns the URL for signing up for a new WordPress.com account with the given theme pre-selected.
  *