diff --git a/ui/component/userChannelFollowIntro/view.jsx b/ui/component/userChannelFollowIntro/view.jsx
index 122c5313c..3f02ce4bb 100644
--- a/ui/component/userChannelFollowIntro/view.jsx
+++ b/ui/component/userChannelFollowIntro/view.jsx
@@ -46,11 +46,9 @@ function UserChannelFollowIntro(props: Props) {
           <div className="section__actions--between">
             <Button button="secondary" onClick={onBack} label={__('Back')} />
             <Button
-              button="primary"
-              type="Submit"
+              button={subscribedChannels.length < 1 ? 'alt' : 'primary'}
               onClick={onContinue}
-              label={__('Continue')}
-              disabled={subscribedChannels.length < 1}
+              label={subscribedChannels.length < 1 ? __('Skip') : __('Continue')}
             />
           </div>
           <div className="section__body">
diff --git a/ui/component/userTagFollowIntro/view.jsx b/ui/component/userTagFollowIntro/view.jsx
index f69bec9af..6db31a0bd 100644
--- a/ui/component/userTagFollowIntro/view.jsx
+++ b/ui/component/userTagFollowIntro/view.jsx
@@ -26,11 +26,9 @@ function UserTagFollowIntro(props: Props) {
             <div className="section__actions--between">
               <span />
               <Button
-                button="primary"
-                type="Submit"
+                button={followedTags.length < 1 ? 'alt' : 'primary'}
                 onClick={onContinue}
-                label={__('Continue')}
-                disabled={followedTags.length < 1}
+                label={followedTags.length < 1 ? __('Skip') : __('Continue')}
               />
             </div>
           </Form>
diff --git a/ui/page/youtubeSync/view.jsx b/ui/page/youtubeSync/view.jsx
index 595df7051..c4ce907bf 100644
--- a/ui/page/youtubeSync/view.jsx
+++ b/ui/page/youtubeSync/view.jsx
@@ -43,8 +43,13 @@ export default function YoutubeSync(props: Props) {
   const hasYoutubeChannels = youtubeChannels && youtubeChannels.length > 0;
 
   React.useEffect(() => {
-    replace(`?reset_scroll=youtube`);
-  }, []);
+    const urlParamsInEffect = new URLSearchParams(search);
+    if (!urlParamsInEffect.get('reset_scroll')) {
+      urlParamsInEffect.append('reset_scroll', 'youtube');
+    }
+
+    replace(`?${urlParamsInEffect.toString()}`);
+  }, [pathname, search]);
 
   React.useEffect(() => {
     if (statusToken && !hasYoutubeChannels) {