diff --git a/web/src/pages/flows/FlowListPage.ts b/web/src/pages/flows/FlowListPage.ts
index 41d15f02e..fdb6e45d5 100644
--- a/web/src/pages/flows/FlowListPage.ts
+++ b/web/src/pages/flows/FlowListPage.ts
@@ -88,7 +88,7 @@ export class FlowListPage extends TablePage<Flow> {
                 </button>
             </ak-forms-delete>
             <button
-                class="pf-c-button pf-m-secondary ak-root-link"
+                class="pf-c-button pf-m-secondary"
                 @click=${() => {
                     new FlowsApi(DEFAULT_CONFIG).flowsInstancesExecute({
                         slug: item.slug
@@ -98,7 +98,7 @@ export class FlowListPage extends TablePage<Flow> {
                 }}>
                 ${gettext("Execute")}
             </button>
-            <a class="pf-c-button pf-m-secondary ak-root-link" href="${`${DEFAULT_CONFIG.basePath}/flows/instances/${item.slug}/export/`}">
+            <a class="pf-c-button pf-m-secondary" href="${`${DEFAULT_CONFIG.basePath}/flows/instances/${item.slug}/export/`}">
                 ${gettext("Export")}
             </a>`,
         ];
diff --git a/web/src/pages/flows/FlowViewPage.ts b/web/src/pages/flows/FlowViewPage.ts
index 329519659..f72a5cf15 100644
--- a/web/src/pages/flows/FlowViewPage.ts
+++ b/web/src/pages/flows/FlowViewPage.ts
@@ -80,9 +80,17 @@ export class FlowViewPage extends LitElement {
                                         </dt>
                                         <dd class="pf-c-description-list__description">
                                             <div class="pf-c-description-list__text">
-                                                <a class="pf-c-button pf-m-secondary ak-root-link" href="${AdminURLManager.flows(`${this.flow.pk}/execute/?next=/%23${window.location.href}`)}">
+                                                <button
+                                                    class="pf-c-button pf-m-secondary"
+                                                    @click=${() => {
+                                                    new FlowsApi(DEFAULT_CONFIG).flowsInstancesExecute({
+                                                        slug: flow.slug
+                                                    }).then(link => {
+                                                        window.location.assign(`${link.link}?next=/%23${window.location.href}`);
+                                                    });
+                                                }}>
                                                     ${gettext("Execute")}
-                                                </a>
+                                                </button>
                                             </div>
                                         </dd>
                                     </div>