diff --git a/ghost/admin/app/components/dashboard/onboarding-checklist.hbs b/ghost/admin/app/components/dashboard/onboarding-checklist.hbs
index 05e0eaeaa0..2a3d6e2a3b 100644
--- a/ghost/admin/app/components/dashboard/onboarding-checklist.hbs
+++ b/ghost/admin/app/components/dashboard/onboarding-checklist.hbs
@@ -45,7 +45,7 @@
                 />
             </LinkTo>
             {{!-- Step 5 --}}
-            <div role="button" {{on "click" (toggle-action "showShareModal" this)}} class="gh-onboarding-item {{onboarding-step-class "share-publication"}}">
+            <div role="button" {{on "click" this.openShareModal}} class="gh-onboarding-item {{onboarding-step-class "share-publication"}}">
                 <Dashboard::Onboarding::Step
                     @icon="megaphone"
                     @title="Share your publication"
@@ -66,11 +66,4 @@
     {{#unless this.onboarding.allStepsCompleted}}
         <a href="#" class="gh-onboarding-skip" {{on "click" this.onboarding.dismissChecklist}}>Skip onboarding</a>
     {{/unless}}
-</div>
-
-{{#if this.showShareModal}}
-<GhFullscreenModal @modal="share"
-    @close={{this.close}}
-    @modifier="action wide"
-     />
-{{/if}}
\ No newline at end of file
+</div>
\ No newline at end of file
diff --git a/ghost/admin/app/components/dashboard/onboarding-checklist.js b/ghost/admin/app/components/dashboard/onboarding-checklist.js
index 8ff6c56204..ed3a964560 100644
--- a/ghost/admin/app/components/dashboard/onboarding-checklist.js
+++ b/ghost/admin/app/components/dashboard/onboarding-checklist.js
@@ -1,16 +1,31 @@
 import Component from '@glimmer/component';
+import ShareModal from './onboarding/share-modal';
+import {action} from '@ember/object';
 import {inject} from 'ghost-admin/decorators/inject';
 import {inject as service} from '@ember/service';
-import {tracked} from '@glimmer/tracking';
 
 export default class OnboardingChecklist extends Component {
+    @service modals;
     @service onboarding;
 
     @inject config;
 
-    @tracked showMemberTierModal = false;
+    shareModal = null;
+
+    willDestroy() {
+        super.willDestroy(...arguments);
+        if (this.shareModal) {
+            this.shareModal.close();
+        }
+    }
 
     get siteUrl() {
         return this.config.blogTitle;
     }
+
+    @action
+    openShareModal() {
+        this.onboarding.markStepCompleted('share-publication');
+        this.shareModal = this.modals.open(ShareModal);
+    }
 }
diff --git a/ghost/admin/app/components/dashboard/onboarding/share-modal.hbs b/ghost/admin/app/components/dashboard/onboarding/share-modal.hbs
new file mode 100644
index 0000000000..8ee7a32f6a
--- /dev/null
+++ b/ghost/admin/app/components/dashboard/onboarding/share-modal.hbs
@@ -0,0 +1,62 @@
+<div class="modal-content" data-test-modal="onboarding-share">
+    <header class="modal-header">
+        <h1>Share your publication</h1>
+    </header>
+    <button type="button" class="close" title="Close" {{on "click" @close}}>{{svg-jar "close"}}<span class="hidden">Close</span></button>
+
+    <div class="share-card-container">
+        {{#let (get-setting "coverImage") as |imageUrl|}}
+            {{#if imageUrl}}
+                <div class="share-card-image">
+                    <img src={{imageUrl}} alt="" role="presentation" />
+                </div>
+            {{else}}
+                <div class="share-card-image placeholder">{{svg-jar "picture"}}</div>
+            {{/if}}
+
+            <div class="share-card-content">
+                <div class="share-card-title">{{get-setting "title"}}</div>
+                <div class="share-card-description">
+                    {{get-setting "description"}}
+                </div>
+            </div>
+        {{/let}}
+    </div>
+
+
+    <span class="tip">Set your publication’s cover image and description in <a href="settings/design/edit/?ref=share-modal" title="Adjust settings">Settings</a></span>
+
+    <div class="copy-publication-link">
+        <span>{{this.config.blogUrl}}</span>
+        <GhTaskButton
+            data-test-button="copy-share-link"
+            @buttonText="Copy"
+            @task={{this.copySiteUrl}}
+            @successText="Copied!"
+            @successClass="gh-share-link-success"
+            @class="gh-btn-icon"
+        />
+    </div>
+
+    <ul class="share-links">
+        <li>
+            <a href="https://twitter.com/intent/tweet?url={{this.encodedUrl}}" target="_blank" rel="noopener noreferrer" class="share-link" title="Share your publication on X">
+                <span>{{svg-jar "social-x"}}</span>
+            </a>
+        </li>
+        <li>
+            <a href="https://www.facebook.com/sharer/sharer.php?u={{this.encodedUrl}}" target="_blank" rel="noopener noreferrer" class="gh-share-link" title="Share your publication on Facebook">
+                <div class="share-link-content">
+                    <span>{{svg-jar "social-facebook"}}</span>
+                </div>
+            </a>
+        </li>
+        <li>
+            <a href="https://www.linkedin.com/sharing/share-offsite/?url={{this.encodedUrl}}" target="_blank" rel="noopener noreferrer" class="gh-share-link" title="Share your publication on LinkedIn">
+                <div class="share-link-content">
+                    <span>{{svg-jar "social-linkedin"}}</span>
+                </div>
+            </a>
+        </li>
+    </ul>
+</div>
\ No newline at end of file
diff --git a/ghost/admin/app/components/dashboard/onboarding/share-modal.js b/ghost/admin/app/components/dashboard/onboarding/share-modal.js
new file mode 100644
index 0000000000..80066f1b99
--- /dev/null
+++ b/ghost/admin/app/components/dashboard/onboarding/share-modal.js
@@ -0,0 +1,18 @@
+import Component from '@glimmer/component';
+import copyTextToClipboard from 'ghost-admin/utils/copy-text-to-clipboard';
+import {inject} from 'ghost-admin/decorators/inject';
+import {task} from 'ember-concurrency';
+
+export default class OnboardingShareModal extends Component {
+    @inject config;
+
+    get encodedUrl() {
+        return encodeURIComponent(this.config.blogUrl);
+    }
+
+    @task
+    *copySiteUrl() {
+        yield copyTextToClipboard(this.config.blogUrl);
+        return true;
+    }
+}
diff --git a/ghost/admin/app/components/modal-share.hbs b/ghost/admin/app/components/modal-share.hbs
deleted file mode 100644
index eba42b5293..0000000000
--- a/ghost/admin/app/components/modal-share.hbs
+++ /dev/null
@@ -1,76 +0,0 @@
-  <header class="modal-header">
-      <h1>Share your publication</h1>
-  </header>
-  <a class="close" href="" role="button" title="Close">
-      {{svg-jar "close"}}
-      <span class="hidden">Close</span>
-  </a>
-
-  <div class="share-card-container">
-    {{#let (or @post.featureImage (get-setting "coverImage")) as |imageUrl|}}
-    {{#if imageUrl}}
-      <div class="share-card-image">
-        <img src={{imageUrl}} alt="" role="presentation" />
-      </div>
-    {{else}}
-    <div class="share-card-image placeholder">
-      {{svg-jar "picture"}}
-    </div>
-    {{/if}}
-
-    <div class="share-card-content">
-      <div class="share-card-title">
-        {{get-setting "title"}}
-      </div>
-      <div class="share-card-description">
-        {{ get-setting "description"}}
-      </div>
-    </div>
-    {{/let}}
-  </div>
-
-
-  <span class="tip">Set your publication’s cover image and description in <a href="settings/design/edit/?ref=share-modal" title="Adjust settings">Settings</a></span>
-
-  <div class="copy-publication-link">
-    <span>
-      {{ this.config.blogUrl }}
-    </span>
-    <GhTaskButton
-      data-test-button="copy-share-link"
-      @buttonText="Copy"
-      @task={{this.copySiteUrl}}
-      @successText="Copied!"
-      @successClass="gh-share-link-success"
-      @class="gh-btn-icon" />
-    </div>
-
-  <ul class="share-links">
-    <li>
-      <a href="{{this.xShareUrl}}" target="_blank" rel="noopener noreferrer" class="share-link" title="Share your publication on X">
-        <span>
-          {{svg-jar "social-x"}}
-        </span>
-      </a>
-    </li>
-    <li>
-      <a href="{{this.facebookShareUrl}}" target="_blank" rel="noopener noreferrer" class="gh-share-link" title="Share your publication on Facebook">
-        <div class="share-link-content">
-          <span>
-            {{svg-jar "social-facebook"}}
-          </span>
-        </div>
-  
-      </a>
-    </li>
-    <li>
-      <a href="{{this.linkedInShareUrl}}" target="_blank" rel="noopener noreferrer" class="gh-share-link" title="Share your publication on LinkedIn">
-        <div class="share-link-content">
-          <span>
-            {{svg-jar "social-linkedin"}}
-          </span>
-        </div>
-      </a>
-    </li>
-  </ul>
-
diff --git a/ghost/admin/app/components/modal-share.js b/ghost/admin/app/components/modal-share.js
deleted file mode 100644
index 2975f5037c..0000000000
--- a/ghost/admin/app/components/modal-share.js
+++ /dev/null
@@ -1,31 +0,0 @@
-import ModalComponent from 'ghost-admin/components/modal-base';
-import copyTextToClipboard from 'ghost-admin/utils/copy-text-to-clipboard';
-import {inject} from 'ghost-admin/decorators/inject';
-import {task, timeout} from 'ember-concurrency';
-
-export default ModalComponent.extend({
-    config: inject(),
-
-    copySiteUrl: task(function* () {
-        copyTextToClipboard(this.config.blogUrl);
-        yield timeout(1000);
-        return true;
-    }),
-
-    get encodedUrl() {
-        return encodeURIComponent(this.config.blogUrl);
-    },
-
-    get facebookShareUrl() {
-        return `https://www.facebook.com/sharer/sharer.php?u=${this.encodedUrl}`;
-    },
-
-    get linkedInShareUrl() {
-        return `https://www.linkedin.com/sharing/share-offsite/?url=${this.encodedUrl}`;
-    },
-
-    get xShareUrl() {
-        return `https://twitter.com/intent/tweet?url=${this.encodedUrl}`;
-    }
-
-});
\ No newline at end of file