diff --git a/packages/builder/src/pages/builder/app/updating/[application].svelte b/packages/builder/src/pages/builder/app/updating/[application].svelte
index 6994331eff..ec6196aaca 100644
--- a/packages/builder/src/pages/builder/app/updating/[application].svelte
+++ b/packages/builder/src/pages/builder/app/updating/[application].svelte
@@ -1,65 +1,19 @@
 <script>
+  import { Updating } from "@budibase/frontend-core"
   import { redirect, params } from "@roxi/routify"
 
   import { API } from "api"
 
-  const timeoutMs = 180000 // 3 minutes
-  const loadTime = Date.now()
-
-  let timedOut = false
-
-  async function checkMigrationsFinished() {
-    setTimeout(async () => {
-      const response = await API.getMigrationStatus()
-      if (!response.migrated) {
-        if (loadTime + timeoutMs > Date.now()) {
-          return checkMigrationsFinished()
-        }
-
-        return migrationTimeout()
-      }
-
-      // For some reason routify params is not stripping the ? properly, so we need to check both with and without ?
-      const returnUrl = $params.returnUrl || $params["?returnUrl"]
-      $redirect(returnUrl)
-    }, 1000)
+  async function isMigrationDone() {
+    const response = await API.getMigrationStatus()
+    return response.migrated
   }
 
-  checkMigrationsFinished()
-
-  function migrationTimeout() {
-    timedOut = true
+  async function onMigrationDone() {
+    // For some reason routify params is not stripping the ? properly, so we need to check both with and without ?
+    const returnUrl = $params.returnUrl || $params["?returnUrl"]
+    $redirect(returnUrl)
   }
-
-  $: text = !timedOut ? "System update" : "Something went wrong!"
-  $: subtext = !timedOut
-    ? "Please wait and we will be back in a second!"
-    : "An error occurred, please try again later"
 </script>
 
-<div class="loading" class:timeout={timedOut}>
-  <span class="header">{text}</span>
-  <span class="subtext">{subtext}</span>
-</div>
-
-<style>
-  .loading {
-    display: flex;
-    justify-content: center;
-    flex-direction: column;
-    gap: var(--spacing-l);
-    height: 100vh;
-    text-align: center;
-    font-size: 18px;
-  }
-  .header {
-    font-weight: 700;
-  }
-  .timeout .header {
-    color: rgb(196, 46, 46);
-  }
-  .subtext {
-    font-size: 16px;
-    color: var(--grey-7);
-  }
-</style>
+<Updating timeoutMs={180000} {isMigrationDone} {onMigrationDone} />
diff --git a/packages/frontend-core/src/components/Updating.svelte b/packages/frontend-core/src/components/Updating.svelte
new file mode 100644
index 0000000000..b591c7e61c
--- /dev/null
+++ b/packages/frontend-core/src/components/Updating.svelte
@@ -0,0 +1,61 @@
+<script>
+  export let isMigrationDone
+  export let onMigrationDone
+  export let timeoutMs = 180000 // 3 minutes
+
+  const loadTime = Date.now()
+  let timedOut = false
+
+  async function checkMigrationsFinished() {
+    setTimeout(async () => {
+      const isMigrated = await isMigrationDone()
+      if (!isMigrated) {
+        if (loadTime + timeoutMs > Date.now()) {
+          return checkMigrationsFinished()
+        }
+
+        return migrationTimeout()
+      }
+
+      onMigrationDone()
+    }, 1000)
+  }
+
+  checkMigrationsFinished()
+
+  function migrationTimeout() {
+    timedOut = true
+  }
+
+  $: text = !timedOut ? "System update" : "Something went wrong!"
+  $: subtext = !timedOut
+    ? "Please wait and we will be back in a second!"
+    : "An error occurred, please try again later"
+</script>
+
+<div class="loading" class:timeout={timedOut}>
+  <span class="header">{text}</span>
+  <span class="subtext">{subtext}</span>
+</div>
+
+<style>
+  .loading {
+    display: flex;
+    justify-content: center;
+    flex-direction: column;
+    gap: var(--spacing-l);
+    height: 100vh;
+    text-align: center;
+    font-size: 18px;
+  }
+  .header {
+    font-weight: 700;
+  }
+  .timeout .header {
+    color: rgb(196, 46, 46);
+  }
+  .subtext {
+    font-size: 16px;
+    color: var(--grey-7);
+  }
+</style>
diff --git a/packages/frontend-core/src/components/index.js b/packages/frontend-core/src/components/index.js
index 01a7c78cb8..f724e1e4d9 100644
--- a/packages/frontend-core/src/components/index.js
+++ b/packages/frontend-core/src/components/index.js
@@ -3,4 +3,5 @@ export { default as TestimonialPage } from "./TestimonialPage.svelte"
 export { default as Testimonial } from "./Testimonial.svelte"
 export { default as UserAvatar } from "./UserAvatar.svelte"
 export { default as UserAvatars } from "./UserAvatars.svelte"
+export { default as Updating } from "./Updating.svelte"
 export { Grid } from "./grid"