diff --git a/classes/payment/ojs/OJSPaymentManager.php b/classes/payment/ojs/OJSPaymentManager.php
index b6c5636f223..889307ed62b 100644
--- a/classes/payment/ojs/OJSPaymentManager.php
+++ b/classes/payment/ojs/OJSPaymentManager.php
@@ -102,7 +102,7 @@ public function createQueuedPayment($request, $type, $userId, $assocId, $amount,
                 if ($submission->getData('submissionProgress')) {
                     $payment->setRequestUrl($dispatcher->url($request, Application::ROUTE_PAGE, null, 'submission', null, null, ['id' => $assocId]));
                 } else {
-                    $payment->setRequestUrl($dispatcher->url($request, Application::ROUTE_PAGE, null, 'authorDashboard', 'submission', [$submission->getId()]));
+                    $payment->setRequestUrl($dispatcher->url($request, Application::ROUTE_PAGE, null, 'dashboard', 'mySubmissions', null, ['workflowSubmissionId' => $submission->getId()]));
                 }
                 break;
             case self::PAYMENT_TYPE_MEMBERSHIP: // Deprecated
diff --git a/controllers/grid/toc/TocGridRow.php b/controllers/grid/toc/TocGridRow.php
index 7bd1d1426c2..74fa5a952de 100644
--- a/controllers/grid/toc/TocGridRow.php
+++ b/controllers/grid/toc/TocGridRow.php
@@ -55,7 +55,7 @@ public function initialize($request, $template = null)
             new LinkAction(
                 'workflow',
                 new RedirectAction(
-                    $dispatcher->url($request, PKPApplication::ROUTE_PAGE, null, 'workflow', 'access', [$this->getId()])
+                    $dispatcher->url($request, PKPApplication::ROUTE_PAGE, null, 'dashboard', 'editorial', null, ['workflowSubmissionId' => $this->getId()])
                 ),
                 __('submission.submission'),
                 'information'
diff --git a/pages/dashboard/index.php b/pages/dashboard/index.php
index 68b4361162e..340039a7069 100644
--- a/pages/dashboard/index.php
+++ b/pages/dashboard/index.php
@@ -20,6 +20,7 @@
 
 switch ($op) {
     case 'index':
+        return new APP\pages\dashboard\DashboardHandlerNext();
     case 'editorial':
         return new APP\pages\dashboard\DashboardHandlerNext(PKP\pages\dashboard\DashboardPage::EditorialDashboard);
     case 'mySubmissions':
diff --git a/plugins/reports/articles/ArticleReportPlugin.php b/plugins/reports/articles/ArticleReportPlugin.php
index 1a22f5f4f7c..35d681ba2bf 100644
--- a/plugins/reports/articles/ArticleReportPlugin.php
+++ b/plugins/reports/articles/ArticleReportPlugin.php
@@ -203,7 +203,7 @@ public function display($args, $request)
                 'keywords' => join(', ', $keywords[Locale::getLocale()] ?? $keywords[$submission->getData('locale')] ?? []),
                 'agencies' => join(', ', $agencies[Locale::getLocale()] ?? $agencies[$submission->getData('locale')] ?? []),
                 'status' => $submission->getData('status') == PKPSubmission::STATUS_QUEUED ? $this->getStageLabel($submission->getData('stageId')) : __($statusMap[$submission->getData('status')]),
-                'url' => $request->url(null, 'workflow', 'access', $submission->getId()),
+                'url' => $request->url(null, 'dashboard', 'editorial', null, ['workflowSubmissionId' => $submission->getId()]),
                 'doi' => $publication->getDoi(),
                 'dateSubmitted' => $submission->getData('dateSubmitted'),
                 'lastModified' => $submission->getData('lastModified'),
diff --git a/templates/frontend/objects/article_details.tpl b/templates/frontend/objects/article_details.tpl
index b55dd8aadb4..bbc856a9815 100755
--- a/templates/frontend/objects/article_details.tpl
+++ b/templates/frontend/objects/article_details.tpl
@@ -77,7 +77,7 @@
 	{* Indicate if this is only a preview *}
 	{if $publication->getData('status') !== PKP\submission\PKPSubmission::STATUS_PUBLISHED}
 	<div class="cmp_notification notice">
-		{capture assign="submissionUrl"}{url page="workflow" op="access" path=$article->getId()}{/capture}
+		{capture assign="submissionUrl"}{url page="dashboard" op="editorial" workflowSubmissionId=$article->getId()}{/capture}
 		{translate key="submission.viewingPreview" url=$submissionUrl}
 	</div>
 	{* Notification that this is an old version *}