diff --git a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/ShowNotification.svelte b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/ShowNotification.svelte
index ed4ecc2738..ca8e82ea73 100644
--- a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/ShowNotification.svelte
+++ b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/ShowNotification.svelte
@@ -1,5 +1,5 @@
 <script>
-  import { Select, Label } from "@budibase/bbui"
+  import { Select, Label, Checkbox } from "@budibase/bbui"
   import { onMount } from "svelte"
   import DrawerBindableInput from "components/common/bindings/DrawerBindableInput.svelte"
 
@@ -28,17 +28,22 @@
     if (!parameters.type) {
       parameters.type = "success"
     }
+    if (parameters.autoDismiss == null) {
+      parameters.autoDismiss = true
+    }
   })
 </script>
 
 <div class="root">
-  <Label small>Type</Label>
+  <Label>Type</Label>
   <Select bind:value={parameters.type} options={types} placeholder={null} />
-  <Label small>Message</Label>
+  <Label>Message</Label>
   <DrawerBindableInput
     value={parameters.message}
     on:change={e => (parameters.message = e.detail)}
   />
+  <Label />
+  <Checkbox text="Auto dismiss" bind:value={parameters.autoDismiss} />
 </div>
 
 <style>
diff --git a/packages/client/src/stores/notification.js b/packages/client/src/stores/notification.js
index 9c3dfd1523..bbde660fd4 100644
--- a/packages/client/src/stores/notification.js
+++ b/packages/client/src/stores/notification.js
@@ -62,10 +62,14 @@ const createNotificationStore = () => {
     subscribe: store.subscribe,
     actions: {
       send,
-      info: msg => send(msg, "info", "Info"),
-      success: msg => send(msg, "success", "CheckmarkCircle"),
-      warning: msg => send(msg, "warning", "Alert"),
-      error: msg => send(msg, "error", "Alert", false),
+      info: (msg, autoDismiss) =>
+        send(msg, "info", "Info", autoDismiss ?? true),
+      success: (msg, autoDismiss) =>
+        send(msg, "success", "CheckmarkCircle", autoDismiss ?? true),
+      warning: (msg, autoDismiss) =>
+        send(msg, "warning", "Alert", autoDismiss ?? true),
+      error: (msg, autoDismiss) =>
+        send(msg, "error", "Alert", autoDismiss ?? false),
       blockNotifications,
       dismiss,
     },
diff --git a/packages/client/src/utils/buttonActions.js b/packages/client/src/utils/buttonActions.js
index 7cc0679a2d..a534ee8326 100644
--- a/packages/client/src/utils/buttonActions.js
+++ b/packages/client/src/utils/buttonActions.js
@@ -301,11 +301,11 @@ const continueIfHandler = action => {
 }
 
 const showNotificationHandler = action => {
-  const { message, type } = action.parameters
+  const { message, type, autoDismiss } = action.parameters
   if (!message || !type) {
     return
   }
-  notificationStore.actions[type]?.(message)
+  notificationStore.actions[type]?.(message, autoDismiss)
 }
 
 const handlerMap = {