diff --git a/packages/builder/src/components/userInterface/Feedback.svelte b/packages/builder/src/components/userInterface/Feedback.svelte
deleted file mode 100644
index ecce78b1b0..0000000000
--- a/packages/builder/src/components/userInterface/Feedback.svelte
+++ /dev/null
@@ -1,82 +0,0 @@
-<script>
-  import { FeedbackIcon } from "components/common/Icons/"
-  import { Popover } from "@budibase/bbui"
-  import analytics from "analytics"
-
-  const feedbackUrl = "https://feedback.budibase.com"
-
-  let iconContainer
-  let popover
-  let iframe
-
-  // the app @ feedback.budibase.com expects to be loaded
-  // in an iframe, and posts messages back.
-  // this means that we can submit using the Builder's posthog setup
-  window.addEventListener(
-    "message",
-    function(ev) {
-      if (ev.origin !== feedbackUrl) return
-
-      if (ev.data.type === "loaded") {
-        iframe.setAttribute(
-          "style",
-          `height:${ev.data.height}px; width:${ev.data.width}px`
-        )
-      } else if (ev.data.type === "submitted") {
-        analytics.captureEvent("Feedback Submitted", ev.data.data)
-        popover.hide()
-      }
-    },
-    false
-  )
-</script>
-
-<span class="container" bind:this={iconContainer} on:click={popover.show}>
-  <FeedbackIcon />
-</span>
-<Popover bind:this={popover} anchor={iconContainer} align="right">
-  <iframe src={feedbackUrl} title="feedback" bind:this={iframe}>
-    <html lang="html">
-      <style>
-        body {
-          display: flex;
-          height: 100%;
-          width: 100%;
-          justify-content: center;
-          align-items: center;
-        }
-      </style>
-      <body>
-        <div>Loading...</div>
-      </body>
-    </html>
-  </iframe>
-</Popover>
-
-<style>
-  .container {
-    cursor: pointer;
-    color: var(--grey-7);
-    margin: 0 20px 0 0;
-    font-weight: 500;
-    font-size: 1rem;
-    height: 100%;
-    display: flex;
-    flex: 1;
-    align-items: center;
-    box-sizing: border-box;
-  }
-
-  .container:hover {
-    color: var(--ink);
-    font-weight: 500;
-  }
-
-  iframe {
-    border-style: none;
-    height: auto;
-    overflow-y: hidden;
-    overflow-x: hidden;
-    min-width: 500px;
-  }
-</style>
diff --git a/packages/builder/src/components/userInterface/Feedback/FeedbackIframe.svelte b/packages/builder/src/components/userInterface/Feedback/FeedbackIframe.svelte
new file mode 100644
index 0000000000..0de129ff80
--- /dev/null
+++ b/packages/builder/src/components/userInterface/Feedback/FeedbackIframe.svelte
@@ -0,0 +1,57 @@
+<script>
+  import analytics from "analytics"
+  import { createEventDispatcher } from "svelte"
+
+  const dispatch = createEventDispatcher()
+  const feedbackUrl = "https://feedback.budibase.com"
+
+  let iframe
+
+  // the app @ feedback.budibase.com expects to be loaded
+  // in an iframe, and posts messages back.
+  // this means that we can submit using the Builder's posthog setup
+  window.addEventListener(
+    "message",
+    function(ev) {
+      if (ev.origin !== feedbackUrl) return
+
+      if (ev.data.type === "loaded") {
+        iframe.setAttribute(
+          "style",
+          `height:${ev.data.height}px; width:${ev.data.width}px`
+        )
+      } else if (ev.data.type === "submitted") {
+        analytics.captureEvent("Feedback Submitted", ev.data.data)
+        dispatch("finished")
+      }
+    },
+    false
+  )
+</script>
+
+<iframe src={feedbackUrl} title="feedback" bind:this={iframe}>
+  <html lang="html">
+    <style>
+      body {
+        display: flex;
+        height: 100%;
+        width: 100%;
+        justify-content: center;
+        align-items: center;
+      }
+    </style>
+    <body>
+      <div>Loading...</div>
+    </body>
+  </html>
+</iframe>
+
+<style>
+  iframe {
+    border-style: none;
+    height: auto;
+    overflow-y: hidden;
+    overflow-x: hidden;
+    min-width: 500px;
+  }
+</style>
diff --git a/packages/builder/src/components/userInterface/Feedback/FeedbackNavLink.svelte b/packages/builder/src/components/userInterface/Feedback/FeedbackNavLink.svelte
new file mode 100644
index 0000000000..0a6afe268f
--- /dev/null
+++ b/packages/builder/src/components/userInterface/Feedback/FeedbackNavLink.svelte
@@ -0,0 +1,35 @@
+<script>
+  import { FeedbackIcon } from "components/common/Icons/"
+  import { Popover } from "@budibase/bbui"
+  import FeedbackIframe from "./FeedbackIframe.svelte"
+
+  let iconContainer
+  let popover
+</script>
+
+<span class="container" bind:this={iconContainer} on:click={popover.show}>
+  <FeedbackIcon />
+</span>
+<Popover bind:this={popover} anchor={iconContainer} align="right">
+  <FeedbackIframe on:finished={popover.hide} />
+</Popover>
+
+<style>
+  .container {
+    cursor: pointer;
+    color: var(--grey-7);
+    margin: 0 20px 0 0;
+    font-weight: 500;
+    font-size: 1rem;
+    height: 100%;
+    display: flex;
+    flex: 1;
+    align-items: center;
+    box-sizing: border-box;
+  }
+
+  .container:hover {
+    color: var(--ink);
+    font-weight: 500;
+  }
+</style>
diff --git a/packages/builder/src/pages/[application]/_reset.svelte b/packages/builder/src/pages/[application]/_reset.svelte
index 7647bb6819..fb2b233e2c 100644
--- a/packages/builder/src/pages/[application]/_reset.svelte
+++ b/packages/builder/src/pages/[application]/_reset.svelte
@@ -2,7 +2,7 @@
   import { store, automationStore, backendUiStore } from "builderStore"
   import { Button } from "@budibase/bbui"
   import SettingsLink from "components/settings/Link.svelte"
-  import Feedback from "components/userInterface/Feedback.svelte"
+  import FeedbackNavLink from "components/userInterface/Feedback/FeedbackNavLink.svelte"
   import { get } from "builderStore/api"
   import { isActive, goto, layout } from "@sveltech/routify"
   import { PreviewIcon } from "components/common/Icons/"
@@ -66,7 +66,7 @@
       {/each}
     </div>
     <div class="toprightnav">
-      <Feedback />
+      <FeedbackNavLink />
       <SettingsLink />
       <span
         class:active={false}
diff --git a/packages/builder/src/pages/[application]/deploy/index.svelte b/packages/builder/src/pages/[application]/deploy/index.svelte
index 9f25f54e33..691e039e38 100644
--- a/packages/builder/src/pages/[application]/deploy/index.svelte
+++ b/packages/builder/src/pages/[application]/deploy/index.svelte
@@ -1,16 +1,18 @@
 <script>
   import { onMount } from "svelte"
-  import { Button, Spacer } from "@budibase/bbui"
+  import { Button, Spacer, Modal } from "@budibase/bbui"
   import { store } from "builderStore"
   import { notifier } from "builderStore/store/notifications"
   import api from "builderStore/api"
   import Spinner from "components/common/Spinner.svelte"
   import DeploymentHistory from "components/deploy/DeploymentHistory.svelte"
   import analytics from "analytics"
+  import FeedbackIframe from "components/userInterface/Feedback/FeedbackIframe.svelte"
 
   let loading = false
   let deployments = []
   let poll
+  let feedbackModal
 
   $: appId = $store.appId
 
@@ -31,6 +33,7 @@
       analytics.captureEvent("Deployed App", {
         appId,
       })
+      feedbackModal.show()
     } catch (err) {
       analytics.captureEvent("Deploy App Failed", {
         appId,
@@ -57,6 +60,9 @@
     src="/_builder/assets/deploy-rocket.jpg"
     alt="Rocket flying through sky" />
 </section>
+<Modal bind:this={feedbackModal}>
+  <FeedbackIframe on:finished={feedbackModal.hide} />
+</Modal>
 <DeploymentHistory {appId} />
 
 <style>
