diff --git a/administrator/components/com_workflow/Model/StagesModel.php b/administrator/components/com_workflow/Model/StagesModel.php
index f144b164ac6ec..022fcb8bd40d1 100644
--- a/administrator/components/com_workflow/Model/StagesModel.php
+++ b/administrator/components/com_workflow/Model/StagesModel.php
@@ -136,7 +136,8 @@ public function getListQuery()
 				's.ordering',
 				's.condition',
 				's.default',
-				's.published'
+				's.published',
+				's.description'
 			)
 		);
 
diff --git a/administrator/components/com_workflow/Model/TransitionsModel.php b/administrator/components/com_workflow/Model/TransitionsModel.php
index 16791b2086aa2..5c0c951b04f8a 100644
--- a/administrator/components/com_workflow/Model/TransitionsModel.php
+++ b/administrator/components/com_workflow/Model/TransitionsModel.php
@@ -132,12 +132,13 @@ public function getListQuery()
 
 		$select = $db->quoteName(
 			array(
-				't.id',
-				't.title',
-				't.from_stage_id',
-				't.to_stage_id',
-				't.published',
-				't.ordering',
+			't.id',
+			't.title',
+			't.from_stage_id',
+			't.to_stage_id',
+			't.published',
+			't.ordering',
+			't.description',
 			)
 		);
 
diff --git a/administrator/components/com_workflow/forms/stage.xml b/administrator/components/com_workflow/forms/stage.xml
index 379aff69b8595..6b481aa963846 100644
--- a/administrator/components/com_workflow/forms/stage.xml
+++ b/administrator/components/com_workflow/forms/stage.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <form>
-	<fieldset addfieldprefix="Joomla\Component\Workflow\Administrator\Field">
+	<fieldset name="stage" addfieldprefix="Joomla\Component\Workflow\Administrator\Field">
 		<field
 			name="id"
 			type="text"
@@ -14,22 +14,19 @@
 			name="title"
 			type="text"
 			label="COM_WORKFLOW_FIELD_NAME_LABEL"
-			class="input-xxlarge input-large-text"
 			size="40"
 			required="true"
 		/>
 		<field
 			name="description"
-			type="editor"
-			label="COM_WORKFLOW_FIELD_DESC_LABEL"
-			class="input-xxlarge input-large-text"
+			type="text"
+			label="COM_WORKFLOW_STAGE_NOTE"
 		/>
 		<field
-				name="condition"
-				type="workflowcondition"
-				label="COM_WORKFLOW_CONDITION"
-				description="COM_WORKFLOW_CONDITION_DESC"
-				class="input-xxlarge input-large-text"
+			name="condition"
+			type="workflowcondition"
+			label="COM_WORKFLOW_CONDITION"
+			description="COM_WORKFLOW_CONDITION_DESC"
 		/>
 	</fieldset>
 
diff --git a/administrator/components/com_workflow/forms/transition.xml b/administrator/components/com_workflow/forms/transition.xml
index 5087b3b8c6519..5b59a45759c24 100644
--- a/administrator/components/com_workflow/forms/transition.xml
+++ b/administrator/components/com_workflow/forms/transition.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <form>
-	<fieldset addfieldprefix="Joomla\Component\Workflow\Administrator\Field">
+	<fieldset name="transition" addfieldprefix="Joomla\Component\Workflow\Administrator\Field">
 		<field
 			name="id"
-			type="text"
+			type="hidden"
 			label="JGLOBAL_FIELD_ID_LABEL"
 			default="0"
 			class="readonly"
@@ -14,7 +14,6 @@
 			name="title"
 			type="text"
 			label="COM_WORKFLOW_FIELD_NAME_LABEL"
-			class="input-xxlarge input-large-text"
 			size="40"
 			required="true"
 		/>
@@ -40,9 +39,8 @@
 		/>
 		<field
 			name="description"
-			type="editor"
-			label="COM_WORKFLOW_FIELD_DESC_LABEL"
-			class="input-xxlarge input-large-text"
+			type="text"
+			label="COM_WORKFLOW_TRANSITION_NOTE"
 		/>
 	</fieldset>
 
diff --git a/administrator/components/com_workflow/tmpl/stage/edit.php b/administrator/components/com_workflow/tmpl/stage/edit.php
index cc781e83f1079..f447a95dab957 100644
--- a/administrator/components/com_workflow/tmpl/stage/edit.php
+++ b/administrator/components/com_workflow/tmpl/stage/edit.php
@@ -39,7 +39,7 @@
 	<div class="row">
 		<div class="col-md-9">
 			<?php echo $this->form->renderField('condition'); ?>
-			<?php echo $this->form->getInput('description'); ?>
+			<?php echo $this->form->renderField('description'); ?>
 		</div>
 		<div class="col-md-3">
 			<div class="card card-block card-light">
diff --git a/administrator/components/com_workflow/tmpl/stages/default.php b/administrator/components/com_workflow/tmpl/stages/default.php
index 3abd99c493d08..9710911ef33b9 100644
--- a/administrator/components/com_workflow/tmpl/stages/default.php
+++ b/administrator/components/com_workflow/tmpl/stages/default.php
@@ -123,8 +123,10 @@
 											<a href="<?php echo $edit; ?>" title="<?php echo Text::_('JACTION_EDIT'); ?> <?php echo $this->escape(addslashes(Text::_($item->title))); ?>">
 												<?php echo $editIcon; ?><?php echo $this->escape(Text::_($item->title)); ?>
 											</a>
+											<div class="small"><?php echo $this->escape(Text::_($item->description)); ?></div>
 										<?php else: ?>
 											<?php echo $this->escape(Text::_($item->title)); ?>
+											<div class="small"><?php echo $this->escape(Text::_($item->description)); ?></div>
 										<?php endif; ?>
 									</th>
 									<td class="text-center">
diff --git a/administrator/components/com_workflow/tmpl/transition/edit.php b/administrator/components/com_workflow/tmpl/transition/edit.php
index f4688b0d73237..798621dfca777 100644
--- a/administrator/components/com_workflow/tmpl/transition/edit.php
+++ b/administrator/components/com_workflow/tmpl/transition/edit.php
@@ -26,46 +26,22 @@
 ?>
 
 <form action="<?php echo Route::_('index.php?option=com_workflow&view=transition&workflow_id=' . $this->workflowID . '&extension=' . $this->input->getCmd('extension') . '&layout=' . $layout . $tmpl . '&id=' . (int) $this->item->id); ?>" method="post" name="adminForm" id="workflow-form" class="form-validate">
-
-	<?php echo LayoutHelper::render('joomla.edit.title_alias', $this); ?>
-
 	<div>
+		<?php echo LayoutHelper::render('joomla.edit.title_alias', $this); ?>
+
 		<?php echo HTMLHelper::_('uitab.startTabSet', 'myTab', array('active' => 'details')); ?>
 
 		<?php echo HTMLHelper::_('uitab.addTab', 'myTab', 'details', Text::_('COM_WORKFLOW_DESCRIPTION')); ?>
 		<div class="row">
 			<div class="col-md-9">
-				<div class="control-group">
-					<div class="control-label">
-						<?php echo $this->form->getLabel('from_stage_id'); ?>
-					</div>
-					<div class="controls">
-						<?php echo $this->form->getInput('from_stage_id'); ?>
-					</div>
-				</div>
-				<div class="control-group">
-					<div class="control-label">
-						<?php echo $this->form->getLabel('to_stage_id'); ?>
-					</div>
-					<div class="controls">
-						<?php echo $this->form->getInput('to_stage_id'); ?>
-					</div>
-				</div>
-				<?php echo $this->form->getInput('description'); ?>
+				<?php echo $this->form->renderField('from_stage_id'); ?>
+				<?php echo $this->form->renderField('to_stage_id'); ?>
+				<?php echo $this->form->renderField('description'); ?>
 			</div>
 			<div class="col-md-3">
 				<div class="card card-block card-light">
 					<div class="card-body">
-						<fieldset class="form-vertical form-no-margin">
-							<div class="control-group">
-								<div class="control-label">
-									<?php echo $this->form->getLabel('published'); ?>
-								</div>
-								<div class="controls">
-									<?php echo $this->form->getInput('published'); ?>
-								</div>
-							</div>
-						</fieldset>
+						<?php echo LayoutHelper::render('joomla.edit.global', $this); ?>
 					</div>
 				</div>
 			</div>
diff --git a/administrator/components/com_workflow/tmpl/transitions/default.php b/administrator/components/com_workflow/tmpl/transitions/default.php
index 97bfd3f5072a9..aa30f765ecc68 100644
--- a/administrator/components/com_workflow/tmpl/transitions/default.php
+++ b/administrator/components/com_workflow/tmpl/transitions/default.php
@@ -116,10 +116,12 @@
 										<?php if ($canEdit) : ?>
 											<?php $editIcon = '<span class="fa fa-pencil-square mr-2" aria-hidden="true"></span>'; ?>
 											<a href="<?php echo $edit; ?>" title="<?php echo Text::_('JACTION_EDIT'); ?> <?php echo $this->escape(addslashes(Text::_($item->title))); ?>">
-												<?php echo $editIcon; ?><?php echo $item->title; ?>
+												<?php echo $editIcon; ?><?php echo $this->escape(Text::_($item->title)); ?>
 											</a>
+											<div class="small"><?php echo $this->escape(Text::_($item->description)); ?></div>
 										<?php else: ?>
-											<?php echo $item->title; ?>
+											<?php echo $this->escape(Text::_($item->title)); ?>
+											<div class="small"><?php echo $this->escape(Text::_($item->description)); ?></div>
 										<?php endif; ?>
 									</th>
 									<td class="text-center">
diff --git a/administrator/language/en-GB/en-GB.com_workflow.ini b/administrator/language/en-GB/en-GB.com_workflow.ini
index bc79ac668285f..6056b348c9b7c 100644
--- a/administrator/language/en-GB/en-GB.com_workflow.ini
+++ b/administrator/language/en-GB/en-GB.com_workflow.ini
@@ -79,6 +79,7 @@ COM_WORKFLOW_STAGES="Stages"
 COM_WORKFLOW_STAGES_LIST="%s Stages List"
 COM_WORKFLOW_STAGE_ADD="Add Stage"
 COM_WORKFLOW_STAGE_EDIT="Edit Stage"
+COM_WORKFLOW_STAGE_NOTE="Note"
 COM_WORKFLOW_TOOLBAR_DEFAULT="Default"
 COM_WORKFLOW_TO_STAGE="To Stage"
 COM_WORKFLOW_TO_STAGE_DESC="Select target stage."
@@ -89,6 +90,7 @@ COM_WORKFLOW_TRANSITIONS_LIST="%s Transitions List"
 COM_WORKFLOW_TRANSITION_ADD="Add Transition"
 COM_WORKFLOW_TRANSITION_DUPLICATE="This transition already exists."
 COM_WORKFLOW_TRANSITION_EDIT="Edit Transition"
+COM_WORKFLOW_TRANSITION_NOTE="Note"
 COM_WORKFLOW_TRANSITION_THE_SAME_STAGE="Current stage and target stage are the same."
 COM_WORKFLOW_TRASHED="Trashed"
 COM_WORKFLOW_UNPUBLISH_DEFAULT_ERROR="You can't unpublish the default workflow."