diff --git a/src/components/Modal/Modal.vue b/src/components/Modal/Modal.vue
index 3954358ff..f7d83cd2d 100644
--- a/src/components/Modal/Modal.vue
+++ b/src/components/Modal/Modal.vue
@@ -259,9 +259,108 @@ export default {
 	}
 }
 
+/**
+ * Isolate all of the styles for a popup modal
+ *
+ * As part of UX changes, our designer is encouraging us to move to
+ * the side-panel style of modal. Ideally, popup modals will only
+ * be used for simple Dialogs. Until then, these styles will need
+ * to remain to support existing uses of the pop-up modal.
+ */
+.modal--popup {
+	.modal__panel {
+		font-size: @font-sml;
+		line-height: @line-sml;
+	}
+	.modal__header {
+		display: flex;
+		align-items: center;
+		min-height: 3rem;
+	}
+	.modal__title {
+		margin: 0;
+		min-width: 1px;
+		padding: 0.5rem 1rem;
+		font-size: @font-base;
+		white-space: nowrap;
+		overflow-x: hidden;
+		text-overflow: ellipsis;
+	}
+	.modal__closeButton {
+		margin-inline-start: auto; // fix position when no title exists
+		margin-inline-end: 0.5rem;
+		border: none;
+		font-size: @font-lead;
+		line-height: 1;
+		width: 2rem;
+		height: 2rem;
+		text-align: center;
+		background: transparent;
+		cursor: pointer;
+	}
+	.modal__closeButton:focus-visible {
+		outline: 0;
+		border-radius: @radius;
+		border: 1px solid @primary;
+	}
+	.modal__closeButton__left,
+	.modal__closeButton__right {
+		display: none;
+	}
+	.modal__content {
+		padding: 1rem;
+		> p:first-child {
+			margin-top: 0;
+		}
+		> p:last-child {
+			margin-bottom: 0;
+		}
+	}
+	.modal__footer {
+		display: flex;
+		justify-content: flex-end;
+		align-items: center;
+		padding: 1rem;
+		* + .pkpButton {
+			margin-inline-start: 0.5rem;
+		}
+	}
+	// Forms in popupmodals
+	.pkpForm {
+		margin: -1rem;
+	}
+	.pkpFormLocales {
+		border-top: @bg-border-light;
+	}
+	.pkpFormGroup {
+		padding-inline-start: 1rem;
+		padding-inline-end: 1rem;
+	}
+	// Tabs in popup modals
+	.pkpTabs {
+		margin-inline-start: -1rem;
+		margin-inline-end: -1rem;
+	}
+	.pkpTabs {
+		.pkpTabs {
+			margin-inline-start: -2rem;
+			margin-inline-end: -2rem;
+		}
+	}
+	.pkpTabs__buttons {
+		padding-inline-start: 1rem;
+		padding-inline-end: 1rem;
+	}
+	.pkpTab {
+		border-left: none;
+		border-right: none;
+		border-bottom: none;
+	}
+}
+
 // Override collapsed padding when a popup
 // modal is nested inside of a section
-.panelSection .pkpFormGroup {
+.panelSection .modal--popup .pkpFormGroup {
 	padding: 2rem 1rem;
 }
 </style>
diff --git a/src/composables/useSubmission.js b/src/composables/useSubmission.js
index 79919628d..5416538e3 100644
--- a/src/composables/useSubmission.js
+++ b/src/composables/useSubmission.js
@@ -233,6 +233,13 @@ export function useSubmission() {
 			.map((assignment) => assignment.userId);
 	}
 
+	function isDecisionAvailable(submission, decisionId) {
+		const stage = getActiveStage(submission);
+		return stage?.availableEditorialDecisions?.some(
+			(decision) => decision.id === decisionId,
+		);
+	}
+
 	return {
 		getSubmissionById,
 		getActiveStage,
@@ -256,5 +263,6 @@ export function useSubmission() {
 		getReviewMethodIcons,
 		InProgressReviewAssignmentStatuses,
 		getRecommendOnlyUserIdsForStage,
+		isDecisionAvailable,
 	};
 }
diff --git a/src/pages/workflow/components/action/WorkflowActionChangeDecision.vue b/src/pages/workflow/components/action/WorkflowActionChangeDecision.vue
index 88bc6d3e1..7ed3effee 100644
--- a/src/pages/workflow/components/action/WorkflowActionChangeDecision.vue
+++ b/src/pages/workflow/components/action/WorkflowActionChangeDecision.vue
@@ -1,12 +1,18 @@
 <template>
 	<div>
-		<PkpButton v-if="!isActionsShowed" class="" is-link @click="showActions">
+		<PkpButton
+			v-if="!isActionsShowed && showChangeDecision"
+			class=""
+			is-link
+			@click="showActions"
+		>
 			{{ t('editor.submission.workflowDecision.changeDecision') }}
 		</PkpButton>
 		<div v-else class="flex flex-col space-y-3">
-			<WorkflowActionButton
-				v-for="(actionProps, index) in actionButtonsProps"
-				v-bind="actionProps"
+			<component
+				:is="workflowStore.Components[item.component] || item.component"
+				v-for="(item, index) in items"
+				v-bind="item.props"
 				:key="`${index}`"
 			/>
 		</div>
@@ -16,12 +22,16 @@
 <script setup>
 import {ref} from 'vue';
 import PkpButton from '@/components/Button/Button.vue';
-import WorkflowActionButton from '@/pages/workflow/components/action/WorkflowActionButton.vue';
-
-defineProps({actionButtonsProps: {type: Array, required: true}});
+import {useWorkflowStore} from '../../workflowStore';
+defineProps({
+	showChangeDecision: {type: Boolean, required: true, default: false},
+	items: {type: Array, required: true},
+});
 
 const isActionsShowed = ref(false);
 
+const workflowStore = useWorkflowStore();
+
 function showActions() {
 	isActionsShowed.value = true;
 }
diff --git a/src/pages/workflow/composables/useWorkflowConfig/workflowConfigEditorialOJS.js b/src/pages/workflow/composables/useWorkflowConfig/workflowConfigEditorialOJS.js
index 8aba7d3c6..5b0bd18cf 100644
--- a/src/pages/workflow/composables/useWorkflowConfig/workflowConfigEditorialOJS.js
+++ b/src/pages/workflow/composables/useWorkflowConfig/workflowConfigEditorialOJS.js
@@ -3,10 +3,20 @@ import {Actions} from '../useWorkflowActions';
 import {useSubmission} from '@/composables/useSubmission';
 import {Actions as WorkflowActions} from '../useWorkflowActions';
 import {Actions as DecisionActions} from '../useWorkflowDecisions';
-const {hasSubmissionPassedStage, hasNotSubmissionStartedStage, getStageById} =
-	useSubmission();
+const {
+	hasSubmissionPassedStage,
+	getActiveStage,
+	getStageById,
+	isDecisionAvailable,
+} = useSubmission();
 const {t} = useLocalize();
 
+export function addItemIf(items, item, condition) {
+	if (condition) {
+		items.push(item);
+	}
+}
+
 export function getHeaderItems({
 	submission,
 	selectedPublication,
@@ -113,42 +123,66 @@ export const WorkflowConfig = {
 		},
 
 		getActionItems: ({submission, selectedStageId, selectedReviewRound}) => {
-			const items = [];
-			if (
-				hasSubmissionPassedStage(
-					submission,
-					pkp.const.WORKFLOW_STAGE_ID_SUBMISSION,
-				)
-			) {
-				return [];
-			}
+			let items = [];
 
-			items.push({
-				component: 'WorkflowActionButton',
-				props: {
-					label: t('editor.submission.decision.sendExternalReview'),
-					isPrimary: true,
-					action: DecisionActions.DECISION_EXTERNAL_REVIEW,
+			addItemIf(
+				items,
+				{
+					component: 'WorkflowActionButton',
+					props: {
+						label: t('editor.submission.decision.sendExternalReview'),
+						isPrimary: true,
+						action: DecisionActions.DECISION_EXTERNAL_REVIEW,
+					},
 				},
-			});
+				isDecisionAvailable(submission, pkp.const.DECISION_EXTERNAL_REVIEW),
+			);
 
-			items.push({
-				component: 'WorkflowActionButton',
-				props: {
-					label: t('editor.submission.decision.skipReview'),
-					isSecondary: true,
-					action: DecisionActions.DECISION_SKIP_EXTERNAL_REVIEW,
+			addItemIf(
+				items,
+				{
+					component: 'WorkflowActionButton',
+					props: {
+						label: t('editor.submission.decision.skipReview'),
+						isSecondary: true,
+						action: DecisionActions.DECISION_SKIP_EXTERNAL_REVIEW,
+					},
 				},
-			});
+				isDecisionAvailable(
+					submission,
+					pkp.const.DECISION_SKIP_EXTERNAL_REVIEW,
+				),
+			);
 
-			items.push({
-				component: 'WorkflowActionButton',
-				props: {
-					label: t('editor.submission.decision.decline'),
-					isWarnable: true,
-					action: DecisionActions.DECISION_INITIAL_DECLINE,
+			addItemIf(
+				items,
+				{
+					component: 'WorkflowActionButton',
+					props: {
+						label: t('editor.submission.decision.decline'),
+						isWarnable: true,
+						action: DecisionActions.DECISION_INITIAL_DECLINE,
+					},
 				},
-			});
+				isDecisionAvailable(submission, pkp.const.DECISION_INITIAL_DECLINE),
+			);
+
+			addItemIf(
+				items,
+				{
+					component: 'WorkflowActionButton',
+					props: {
+						label: t('editor.submission.decision.revertDecline'),
+						isSecondary: true,
+						action: DecisionActions.DECISION_REVERT_INITIAL_DECLINE,
+					},
+				},
+				isDecisionAvailable(
+					submission,
+					pkp.const.DECISION_REVERT_INITIAL_DECLINE,
+				),
+			);
+
 			return items;
 		},
 	},
@@ -254,7 +288,7 @@ export const WorkflowConfig = {
 			return items;
 		},
 		getActionItems: ({submission, selectedStageId, selectedReviewRound}) => {
-			const items = [];
+			let items = [];
 			const {getCurrentReviewRound} = useSubmission();
 
 			const currentReviewRound = getCurrentReviewRound(
@@ -263,20 +297,15 @@ export const WorkflowConfig = {
 			);
 
 			// if review stage has not started show no items
-			if (
-				hasNotSubmissionStartedStage(
-					submission,
-					pkp.const.WORKFLOW_STAGE_ID_EXTERNAL_REVIEW,
-				) ||
-				hasSubmissionPassedStage(
-					submission,
-					pkp.const.WORKFLOW_STAGE_ID_EXTERNAL_REVIEW,
-				) ||
-				selectedReviewRound.round < currentReviewRound.round
-			) {
+			if (selectedReviewRound.round < currentReviewRound.round) {
 				return [];
 			}
 
+			const actionArgs = {
+				stageId: pkp.const.WORKFLOW_STAGE_ID_EXTERNAL_REVIEW,
+				reviewRoundId: selectedReviewRound.id,
+			};
+
 			const selectedStage = getStageById(submission, selectedStageId);
 
 			const isRecommendOnlyEditor = selectedStage.currentUserCanRecommendOnly;
@@ -291,57 +320,95 @@ export const WorkflowConfig = {
 					},
 				});
 			} else {
-				const actionArgs = {
-					stageId: pkp.const.WORKFLOW_STAGE_ID_EXTERNAL_REVIEW,
-					reviewRoundId: selectedReviewRound.id,
-				};
+				addItemIf(
+					items,
+					{
+						component: 'WorkflowActionButton',
+						props: {
+							label: t('dashboard.summary.requestRevisions'),
+							isSecondary: true,
+							action: WorkflowActions.WORKFLOW_REQUEST_REVISION,
+							actionArgs,
+						},
+					},
+					isDecisionAvailable(submission, pkp.const.DECISION_RESUBMIT) ||
+						isDecisionAvailable(
+							submission,
+							pkp.const.DECISION_PENDING_REVISIONS,
+						),
+				);
 
-				items.push({
-					component: 'WorkflowActionButton',
-					props: {
-						label: t('dashboard.summary.requestRevisions'),
-						isSecondary: true,
-						action: WorkflowActions.WORKFLOW_REQUEST_REVISION,
-						actionArgs,
+				addItemIf(
+					items,
+					{
+						component: 'WorkflowActionButton',
+						props: {
+							label: t('editor.submission.decision.accept'),
+							action: DecisionActions.DECISION_ACCEPT,
+							isPrimary: true,
+							actionArgs,
+						},
 					},
-				});
+					isDecisionAvailable(submission, pkp.const.DECISION_ACCEPT),
+				);
 
-				items.push({
-					component: 'WorkflowActionButton',
-					props: {
-						label: t('editor.submission.decision.accept'),
-						action: DecisionActions.DECISION_ACCEPT,
-						isPrimary: true,
-						actionArgs,
+				addItemIf(
+					items,
+					{
+						component: 'WorkflowActionButton',
+						props: {
+							label: t('editor.submission.createNewRound'),
+							action: DecisionActions.DECISION_NEW_EXTERNAL_ROUND,
+							actionArgs,
+						},
 					},
-				});
+					isDecisionAvailable(
+						submission,
+						pkp.const.DECISION_NEW_EXTERNAL_ROUND,
+					),
+				);
 
-				items.push({
-					component: 'WorkflowActionButton',
-					props: {
-						label: t('editor.submission.createNewRound'),
-						action: DecisionActions.DECISION_NEW_EXTERNAL_ROUND,
-						actionArgs,
+				addItemIf(
+					items,
+					{
+						component: 'WorkflowActionButton',
+						props: {
+							label: t('editor.submission.decision.cancelReviewRound'),
+							isWarnable: true,
+							action: DecisionActions.DECISION_CANCEL_REVIEW_ROUND,
+						},
 					},
-				});
+					isDecisionAvailable(
+						submission,
+						pkp.const.DECISION_CANCEL_REVIEW_ROUND,
+					),
+				);
 
-				items.push({
-					component: 'WorkflowActionButton',
-					props: {
-						label: t('editor.submission.decision.cancelReviewRound'),
-						isWarnable: true,
-						action: DecisionActions.DECISION_CANCEL_REVIEW_ROUND,
+				addItemIf(
+					items,
+					{
+						component: 'WorkflowActionButton',
+						props: {
+							label: t('editor.submission.decision.decline'),
+							isWarnable: true,
+							action: DecisionActions.DECISION_DECLINE,
+						},
 					},
-				});
+					isDecisionAvailable(submission, pkp.const.DECISION_DECLINE),
+				);
 
-				items.push({
-					component: 'WorkflowActionButton',
-					props: {
-						label: t('editor.submission.decision.decline'),
-						isWarnable: true,
-						action: DecisionActions.DECISION_DECLINE_SUBMISSION,
+				addItemIf(
+					items,
+					{
+						component: 'WorkflowActionButton',
+						props: {
+							label: t('editor.submission.decision.revertDecline'),
+							isSecondary: true,
+							action: DecisionActions.DECISION_REVERT_DECLINE,
+						},
 					},
-				});
+					isDecisionAvailable(submission, pkp.const.DECISION_REVERT_DECLINE),
+				);
 			}
 			return items;
 		},
@@ -407,36 +474,35 @@ export const WorkflowConfig = {
 
 		getActionItems: ({submission, selectedStageId, selectedReviewRound}) => {
 			const items = [];
-			if (
-				hasNotSubmissionStartedStage(
-					submission,
-					pkp.const.WORKFLOW_STAGE_ID_EDITING,
-				) ||
-				hasSubmissionPassedStage(
-					submission,
-					pkp.const.WORKFLOW_STAGE_ID_EDITING,
-				)
-			) {
-				return [];
-			}
 
-			items.push({
-				component: 'WorkflowActionButton',
-				props: {
-					label: t('editor.submission.decision.sendToProduction'),
-					isPrimary: true,
-					action: DecisionActions.DECISION_SEND_TO_PRODUCTION,
+			addItemIf(
+				items,
+				{
+					component: 'WorkflowActionButton',
+					props: {
+						label: t('editor.submission.decision.sendToProduction'),
+						isPrimary: true,
+						action: DecisionActions.DECISION_SEND_TO_PRODUCTION,
+					},
 				},
-			});
+				isDecisionAvailable(submission, pkp.const.DECISION_SEND_TO_PRODUCTION),
+			);
 
-			items.push({
-				component: 'WorkflowActionButton',
-				props: {
-					label: t('editor.submission.decision.backFromCopyediting'),
-					isWarnable: true,
-					action: DecisionActions.DECISION_BACK_FROM_COPYEDITING,
+			addItemIf(
+				items,
+				{
+					component: 'WorkflowActionButton',
+					props: {
+						label: t('editor.submission.decision.backFromCopyediting'),
+						isWarnable: true,
+						action: DecisionActions.DECISION_BACK_FROM_COPYEDITING,
+					},
 				},
-			});
+				isDecisionAvailable(
+					submission,
+					pkp.const.DECISION_BACK_FROM_COPYEDITING,
+				),
+			);
 
 			return items;
 		},
@@ -492,39 +558,37 @@ export const WorkflowConfig = {
 
 		getActionItems: ({submission, selectedStageId, selectedReviewRound}) => {
 			const items = [];
-			if (
-				hasNotSubmissionStartedStage(
-					submission,
-					pkp.const.WORKFLOW_STAGE_ID_PRODUCTION,
-				) ||
-				hasSubmissionPassedStage(
-					submission,
-					pkp.const.WORKFLOW_STAGE_ID_PRODUCTION,
-				)
-			) {
-				return [];
-			}
 
-			items.push({
-				component: 'WorkflowActionButton',
-				props: {
-					label: t('editor.submission.schedulePublication'),
-					isPrimary: true,
-					action: 'navigateToMenu',
-					actionArgs: 'publication_titleAbstract',
+			addItemIf(
+				items,
+				{
+					component: 'WorkflowActionButton',
+					props: {
+						label: t('editor.submission.schedulePublication'),
+						isPrimary: true,
+						action: 'navigateToMenu',
+						actionArgs: 'publication_titleAbstract',
+					},
 				},
-			});
+				getActiveStage(submission).id ===
+					pkp.const.WORKFLOW_STAGE_ID_PRODUCTION,
+			);
 
-			if (submission.status === pkp.const.STATUS_QUEUED) {
-				items.push({
+			addItemIf(
+				items,
+				{
 					component: 'WorkflowActionButton',
 					props: {
 						label: t('editor.submission.decision.backToCopyediting'),
 						isWarnable: true,
 						action: DecisionActions.DECISION_BACK_FROM_PRODUCTION,
 					},
-				});
-			}
+				},
+				isDecisionAvailable(
+					submission,
+					pkp.const.DECISION_BACK_FROM_PRODUCTION,
+				),
+			);
 
 			return items;
 		},
diff --git a/src/pages/workflow/composables/useWorkflowConfig/workflowConfigEditorialOMP.js b/src/pages/workflow/composables/useWorkflowConfig/workflowConfigEditorialOMP.js
index b1f1f44db..41b455010 100644
--- a/src/pages/workflow/composables/useWorkflowConfig/workflowConfigEditorialOMP.js
+++ b/src/pages/workflow/composables/useWorkflowConfig/workflowConfigEditorialOMP.js
@@ -2,8 +2,8 @@ import {useLocalize} from '@/composables/useLocalize';
 import {Actions} from '../useWorkflowActions';
 import {useSubmission} from '@/composables/useSubmission';
 import {Actions as DecisionActions} from '../useWorkflowDecisions';
-
-const {hasSubmissionPassedStage, hasNotSubmissionStartedStage, getStageById} =
+import {addItemIf} from './workflowConfigEditorialOJS';
+const {hasSubmissionPassedStage, getStageById, isDecisionAvailable} =
 	useSubmission();
 const {t} = useLocalize();
 export function getHeaderItems({
@@ -100,50 +100,80 @@ export const WorkflowConfig = {
 
 		getActionItems: ({submission, selectedStageId, selectedReviewRound}) => {
 			const items = [];
-			if (
-				hasSubmissionPassedStage(
+
+			addItemIf(
+				items,
+				{
+					component: 'WorkflowActionButton',
+					props: {
+						label: t('editor.submission.decision.sendExternalReview'),
+						isPrimary: true,
+						action: DecisionActions.DECISION_SKIP_INTERNAL_REVIEW,
+					},
+				},
+				isDecisionAvailable(
 					submission,
-					pkp.const.WORKFLOW_STAGE_ID_SUBMISSION,
-				)
-			) {
-				return [];
-			}
+					pkp.const.DECISION_SKIP_INTERNAL_REVIEW,
+				),
+			);
 
-			items.push({
-				component: 'WorkflowActionButton',
-				props: {
-					label: t('editor.submission.decision.sendExternalReview'),
-					isPrimary: true,
-					action: DecisionActions.DECISION_SKIP_INTERNAL_REVIEW,
+			addItemIf(
+				items,
+				{
+					component: 'WorkflowActionButton',
+					props: {
+						label: t('editor.submission.decision.skipReview'),
+						isSecondary: true,
+						action: DecisionActions.DECISION_SKIP_EXTERNAL_REVIEW,
+					},
 				},
-			});
+				isDecisionAvailable(
+					submission,
+					pkp.const.DECISION_SKIP_EXTERNAL_REVIEW,
+				),
+			);
 
-			items.push({
-				component: 'WorkflowActionButton',
-				props: {
-					label: t('editor.submission.decision.skipReview'),
-					isSecondary: true,
-					action: DecisionActions.DECISION_SKIP_EXTERNAL_REVIEW,
+			addItemIf(
+				items,
+				{
+					component: 'WorkflowActionButton',
+					props: {
+						label: t('editor.submission.decision.decline'),
+						isWarnable: true,
+						action: DecisionActions.DECISION_INITIAL_DECLINE,
+					},
 				},
-			});
+				isDecisionAvailable(submission, pkp.const.DECISION_INITIAL_DECLINE),
+			);
 
-			items.push({
-				component: 'WorkflowActionButton',
-				props: {
-					label: t('editor.submission.decision.decline'),
-					isWarnable: true,
-					action: DecisionActions.DECISION_INITIAL_DECLINE,
+			addItemIf(
+				items,
+				{
+					component: 'WorkflowActionButton',
+					props: {
+						label: t('editor.submission.decision.revertDecline'),
+						isSecondary: true,
+						action: DecisionActions.DECISION_REVERT_INITIAL_DECLINE,
+					},
 				},
-			});
+				isDecisionAvailable(
+					submission,
+					pkp.const.DECISION_REVERT_INITIAL_DECLINE,
+				),
+			);
 
-			items.push({
-				component: 'WorkflowActionButton',
-				props: {
-					label: t('editor.submission.decision.sendInternalReview'),
-					isSecondary: true,
-					action: DecisionActions.DECISION_INTERNAL_REVIEW,
+			addItemIf(
+				items,
+				{
+					component: 'WorkflowActionButton',
+					props: {
+						label: t('editor.submission.decision.sendInternalReview'),
+						isSecondary: true,
+						action: DecisionActions.DECISION_INTERNAL_REVIEW,
+					},
 				},
-			});
+				isDecisionAvailable(submission, pkp.const.DECISION_INTERNAL_REVIEW),
+			);
 
 			return items;
 		},
@@ -258,17 +288,7 @@ export const WorkflowConfig = {
 			);
 
 			// if review stage has not started show no items
-			if (
-				hasNotSubmissionStartedStage(
-					submission,
-					pkp.const.WORKFLOW_STAGE_ID_INTERNAL_REVIEW,
-				) ||
-				hasSubmissionPassedStage(
-					submission,
-					pkp.const.WORKFLOW_STAGE_ID_INTERNAL_REVIEW,
-				) ||
-				selectedReviewRound.round < currentReviewRound.round
-			) {
+			if (selectedReviewRound.round < currentReviewRound.round) {
 				return [];
 			}
 
@@ -291,54 +311,98 @@ export const WorkflowConfig = {
 					reviewRoundId: selectedReviewRound.id,
 				};
 
-				items.push({
-					component: 'WorkflowActionButton',
-					props: {
-						label: t('dashboard.summary.requestRevisions'),
-						isSecondary: true,
-						action: DecisionActions.DECISION_PENDING_REVISIONS_INTERNAL,
-						actionArgs,
+				addItemIf(
+					items,
+					{
+						component: 'WorkflowActionButton',
+						props: {
+							label: t('dashboard.summary.requestRevisions'),
+							isSecondary: true,
+							action: DecisionActions.DECISION_PENDING_REVISIONS_INTERNAL,
+							actionArgs,
+						},
 					},
-				});
+					isDecisionAvailable(
+						submission,
+						pkp.const.DECISION_PENDING_REVISIONS_INTERNAL,
+					),
+				);
 
-				items.push({
-					component: 'WorkflowActionButton',
-					props: {
-						label: t('editor.submission.decision.sendExternalReview'),
-						action: DecisionActions.DECISION_EXTERNAL_REVIEW,
-						isPrimary: true,
-						actionArgs,
+				addItemIf(
+					items,
+					{
+						component: 'WorkflowActionButton',
+						props: {
+							label: t('editor.submission.decision.sendExternalReview'),
+							action: DecisionActions.DECISION_EXTERNAL_REVIEW,
+							isPrimary: true,
+							actionArgs,
+						},
 					},
-				});
+					isDecisionAvailable(submission, pkp.const.DECISION_EXTERNAL_REVIEW),
+				);
 
-				items.push({
-					component: 'WorkflowActionButton',
-					props: {
-						label: t('editor.submission.decision.accept'),
-						action: DecisionActions.DECISION_ACCEPT_INTERNAL,
-						actionArgs,
+				addItemIf(
+					items,
+					{
+						component: 'WorkflowActionButton',
+						props: {
+							label: t('editor.submission.decision.accept'),
+							action: DecisionActions.DECISION_ACCEPT_INTERNAL,
+							isPrimary: true,
+							actionArgs,
+						},
 					},
-				});
+					isDecisionAvailable(submission, pkp.const.DECISION_ACCEPT_INTERNAL),
+				);
 
-				items.push({
-					component: 'WorkflowActionButton',
-					props: {
-						label: t('editor.submission.decision.cancelReviewRound'),
-						isWarnable: true,
-						action: DecisionActions.DECISION_CANCEL_INTERNAL_REVIEW_ROUND,
-						actionArgs,
+				addItemIf(
+					items,
+					{
+						component: 'WorkflowActionButton',
+						props: {
+							label: t('editor.submission.decision.cancelReviewRound'),
+							isWarnable: true,
+							action: DecisionActions.DECISION_CANCEL_INTERNAL_REVIEW_ROUND,
+							actionArgs,
+						},
 					},
-				});
+					isDecisionAvailable(
+						submission,
+						pkp.const.DECISION_CANCEL_INTERNAL_REVIEW_ROUND,
+					),
+				);
 
-				items.push({
-					component: 'WorkflowActionButton',
-					props: {
-						label: t('editor.submission.decision.decline'),
-						isWarnable: true,
-						action: DecisionActions.DECISION_DECLINE_INTERNAL,
-						actionArgs,
+				addItemIf(
+					items,
+					{
+						component: 'WorkflowActionButton',
+						props: {
+							label: t('editor.submission.decision.decline'),
+							isWarnable: true,
+							action: DecisionActions.DECISION_DECLINE_INTERNAL,
+							actionArgs,
+						},
 					},
-				});
+					isDecisionAvailable(submission, pkp.const.DECISION_DECLINE_INTERNAL),
+				);
+
+				addItemIf(
+					items,
+					{
+						component: 'WorkflowActionButton',
+						props: {
+							label: t('editor.submission.decision.revertDecline'),
+							isSecondary: true,
+							action: DecisionActions.DECISION_REVERT_INTERNAL_DECLINE,
+							actionArgs,
+						},
+					},
+					isDecisionAvailable(
+						submission,
+						pkp.const.DECISION_REVERT_INTERNAL_DECLINE,
+					),
+				);
 			}
 			return items;
 		},
diff --git a/src/pages/workflow/composables/useWorkflowConfig/workflowConfigEditorialOPS.js b/src/pages/workflow/composables/useWorkflowConfig/workflowConfigEditorialOPS.js
index 5d4726670..d7a5dc6a1 100644
--- a/src/pages/workflow/composables/useWorkflowConfig/workflowConfigEditorialOPS.js
+++ b/src/pages/workflow/composables/useWorkflowConfig/workflowConfigEditorialOPS.js
@@ -2,7 +2,8 @@ import {useLocalize} from '@/composables/useLocalize';
 import {Actions} from '../useWorkflowActions';
 import {useSubmission} from '@/composables/useSubmission';
 import {Actions as DecisionActions} from '../useWorkflowDecisions';
-const {hasSubmissionPassedStage, hasNotSubmissionStartedStage} =
+import {addItemIf} from './workflowConfigEditorialOJS';
+const {hasSubmissionPassedStage, isDecisionAvailable, getActiveStage} =
 	useSubmission();
 const {t} = useLocalize();
 
@@ -104,60 +105,50 @@ export const WorkflowConfig = {
 
 		getActionItems: ({submission, selectedStageId, selectedReviewRound}) => {
 			const items = [];
-			if (
-				hasNotSubmissionStartedStage(
-					submission,
-					pkp.const.WORKFLOW_STAGE_ID_PRODUCTION,
-				) ||
-				hasSubmissionPassedStage(
-					submission,
-					pkp.const.WORKFLOW_STAGE_ID_PRODUCTION,
-				)
-			) {
-				return [];
-			}
 
-			if (submission.status === pkp.const.STATUS_DECLINED) {
-				items.push({
-					component: 'WorkflowActionChangeDecision',
+			addItemIf(
+				items,
+				{
+					component: 'WorkflowActionButton',
 					props: {
-						actionButtonsProps: [
-							{
-								label: t('editor.submission.schedulePublication'),
-								isPrimary: true,
-								action: 'navigateToMenu',
-								actionArgs: 'publication_titleAbstract',
-							},
-							{
-								label: t('editor.submission.decision.revertDecline'),
-								isSecondary: true,
-								action: DecisionActions.DECISION_REVERT_INITIAL_DECLINE,
-							},
-						],
+						label: t('editor.submission.schedulePublication'),
+						isPrimary: true,
+						action: 'navigateToMenu',
+						actionArgs: 'publication_titleAbstract',
 					},
-				});
-
-				return items;
-			}
+				},
+				getActiveStage(submission).id ===
+					pkp.const.WORKFLOW_STAGE_ID_PRODUCTION,
+			);
 
-			items.push({
-				component: 'WorkflowActionButton',
-				props: {
-					label: t('editor.submission.schedulePublication'),
-					isPrimary: true,
-					action: 'navigateToMenu',
-					actionArgs: 'publication_titleAbstract',
+			addItemIf(
+				items,
+				{
+					component: 'WorkflowActionButton',
+					props: {
+						label: t('editor.submission.decision.decline'),
+						isWarnable: true,
+						action: DecisionActions.DECISION_INITIAL_DECLINE,
+					},
 				},
-			});
+				isDecisionAvailable(submission, pkp.const.DECISION_INITIAL_DECLINE),
+			);
 
-			items.push({
-				component: 'WorkflowActionButton',
-				props: {
-					label: t('editor.submission.decision.decline'),
-					isWarnable: true,
-					action: DecisionActions.DECISION_INITIAL_DECLINE,
+			addItemIf(
+				items,
+				{
+					component: 'WorkflowActionButton',
+					props: {
+						label: t('editor.submission.decision.revertDecline'),
+						isSecondary: true,
+						action: DecisionActions.DECISION_REVERT_INITIAL_DECLINE,
+					},
 				},
-			});
+				isDecisionAvailable(
+					submission,
+					pkp.const.DECISION_REVERT_INITIAL_DECLINE,
+				),
+			);
 
 			return items;
 		},
diff --git a/src/pages/workflow/composables/useWorkflowDecisions.js b/src/pages/workflow/composables/useWorkflowDecisions.js
index a4fb23719..d90604589 100644
--- a/src/pages/workflow/composables/useWorkflowDecisions.js
+++ b/src/pages/workflow/composables/useWorkflowDecisions.js
@@ -4,10 +4,11 @@ import {useUrl} from '@/composables/useUrl';
 export const Actions = {
 	DECISION_ACCEPT: 'decisionAccept',
 	DECISION_CANCEL_REVIEW_ROUND: 'decisionCancelReviewRound',
-	DECISION_DECLINE_SUBMISSION: 'decisionDeclineSubmission',
+	DECISION_DECLINE: 'decisionDecline',
 	DECISION_EXTERNAL_REVIEW: 'decisionExternalReview',
 	DECISION_SKIP_EXTERNAL_REVIEW: 'decisionSkipExternalReview',
 	DECISION_INITIAL_DECLINE: 'decisionInitialDecline',
+	DECISION_REVERT_DECLINE: 'decisionRevertDecline',
 	DECISION_REVERT_INITIAL_DECLINE: 'decisionRevertInitialDecline',
 
 	DECISION_SEND_TO_PRODUCTION: 'decisionSendToProduction',
@@ -70,12 +71,18 @@ export function useWorkflowDecisions() {
 		});
 	}
 
-	function decisionDeclineSubmission({submission, reviewRoundId}) {
+	function decisionDecline({submission, reviewRoundId}) {
 		openDecisionPage(submission, pkp.const.DECISION_DECLINE, {
 			reviewRoundId,
 		});
 	}
 
+	function decisionRevertDecline({submission, reviewRoundId}) {
+		openDecisionPage(submission, pkp.const.DECISION_REVERT_DECLINE, {
+			reviewRoundId,
+		});
+	}
+
 	function decisionExternalReview({submission, reviewRoundId}) {
 		openDecisionPage(submission, pkp.const.DECISION_EXTERNAL_REVIEW, {
 			reviewRoundId,
@@ -233,7 +240,8 @@ export function useWorkflowDecisions() {
 		openDecisionPage,
 		decisionAccept,
 		decisionCancelReviewRound,
-		decisionDeclineSubmission,
+		decisionDecline,
+		decisionRevertDecline,
 		decisionExternalReview,
 		decisionSkipExternalReview,
 		decisionInitialDecline,