diff --git a/e2e/dashboards-suite/dashboard-public-create.spec.ts b/e2e/dashboards-suite/dashboard-public-create.spec.ts
index 1883793d1ed..f6adc4f461e 100644
--- a/e2e/dashboards-suite/dashboard-public-create.spec.ts
+++ b/e2e/dashboards-suite/dashboard-public-create.spec.ts
@@ -16,7 +16,9 @@ e2e.scenario({
     e2e.pages.ShareDashboardModal.shareButton().click();
 
     // Select public dashboards tab
+    e2e().intercept('GET', '/api/dashboards/uid/ZqZnVvFZz/public-config').as('query-public-config');
     e2e.pages.ShareDashboardModal.PublicDashboard.Tab().click();
+    e2e().wait('@query-public-config');
 
     // Saving button should be disabled
     e2e.pages.ShareDashboardModal.PublicDashboard.SaveConfigButton().should('be.disabled');
@@ -27,15 +29,13 @@ e2e.scenario({
     e2e.pages.ShareDashboardModal.PublicDashboard.CostIncreaseCheckbox().should('be.enabled').click({ force: true });
 
     // Switch on enabling toggle
-    e2e.pages.ShareDashboardModal.PublicDashboard.EnableSwitch().click({ force: true });
+    e2e.pages.ShareDashboardModal.PublicDashboard.EnableSwitch().should('be.enabled').click({ force: true });
 
     // Save configuration
     e2e().intercept('POST', '/api/dashboards/uid/ZqZnVvFZz/public-config').as('save');
     e2e.pages.ShareDashboardModal.PublicDashboard.SaveConfigButton().click();
     e2e().wait('@save');
 
-    // e2e.pages.ShareDashboardModal.PublicDashboard.CopyUrlButton().click();
-
     // Checkboxes should be disabled after saving configuration
     e2e.pages.ShareDashboardModal.PublicDashboard.WillBePublicCheckbox().should('be.disabled');
     e2e.pages.ShareDashboardModal.PublicDashboard.LimitedDSCheckbox().should('be.disabled');
@@ -65,7 +65,9 @@ e2e.scenario({
     e2e.pages.ShareDashboardModal.shareButton().click();
 
     // Select public dashboards tab
+    e2e().intercept('GET', '/api/dashboards/uid/ZqZnVvFZz/public-config').as('query-public-config');
     e2e.pages.ShareDashboardModal.PublicDashboard.Tab().click();
+    e2e().wait('@query-public-config');
 
     // Make a request to public dashboards api endpoint without authentication
     e2e.pages.ShareDashboardModal.PublicDashboard.CopyUrlInput()
@@ -97,7 +99,9 @@ e2e.scenario({
     e2e.pages.ShareDashboardModal.shareButton().click();
 
     // Select public dashboards tab
+    e2e().intercept('GET', '/api/dashboards/uid/ZqZnVvFZz/public-config').as('query-public-config');
     e2e.pages.ShareDashboardModal.PublicDashboard.Tab().click();
+    e2e().wait('@query-public-config');
 
     // All checkboxes should be disabled
     e2e.pages.ShareDashboardModal.PublicDashboard.WillBePublicCheckbox().should('be.disabled');
@@ -113,7 +117,7 @@ e2e.scenario({
       .then((text) => e2e().wrap(text).as('url'));
 
     // Switch off enabling toggle
-    e2e.pages.ShareDashboardModal.PublicDashboard.EnableSwitch().click({ force: true });
+    e2e.pages.ShareDashboardModal.PublicDashboard.EnableSwitch().should('be.enabled').click({ force: true });
 
     // Save configuration
     e2e().intercept('POST', '/api/dashboards/uid/ZqZnVvFZz/public-config').as('save');
diff --git a/e2e/dashboards-suite/dashboard-public-templating.spec.ts b/e2e/dashboards-suite/dashboard-public-templating.spec.ts
index 808cff56902..f390e7a8c14 100644
--- a/e2e/dashboards-suite/dashboard-public-templating.spec.ts
+++ b/e2e/dashboards-suite/dashboard-public-templating.spec.ts
@@ -14,7 +14,9 @@ e2e.scenario({
     e2e.pages.ShareDashboardModal.shareButton().click();
 
     // Select public dashboards tab
+    e2e().intercept('GET', '/api/dashboards/uid/HYaGDGIMk/public-config').as('query-public-config');
     e2e.pages.ShareDashboardModal.PublicDashboard.Tab().click();
+    e2e().wait('@query-public-config');
 
     // Warning Alert dashboard cannot be made public because it has template variables
     e2e.pages.ShareDashboardModal.PublicDashboard.TemplateVariablesWarningAlert().should('be.visible');