diff --git a/mscr-ui/src/modules/crosswalk-editor/tabs/node-mappings/index.tsx b/mscr-ui/src/modules/crosswalk-editor/tabs/node-mappings/index.tsx
index f8e0a9e81..0a4b91f60 100644
--- a/mscr-ui/src/modules/crosswalk-editor/tabs/node-mappings/index.tsx
+++ b/mscr-ui/src/modules/crosswalk-editor/tabs/node-mappings/index.tsx
@@ -233,7 +233,7 @@ export default function NodeMappings(props: {
       if (action === 'moveNodeUp' && mappingNodes.length > 1) {
         let sourceNodesNew = [...mappingNodes];
         for (let i = 0; i < mappingNodes.length; i += 1) {
-          if (mappingNodes[i].source.id === mappingId) {
+          if ((isSourceNode && mappingNodes[i].source.id === mappingId) || (!isSourceNode && mappingNodes[i].target.id === mappingId)) {
             let first = mappingNodes[i - 1];
             let second = mappingNodes[i];
             sourceNodesNew[i - 1] = second;
@@ -244,7 +244,7 @@ export default function NodeMappings(props: {
       } else if (action === 'moveNodeDown' && mappingNodes.length > 1) {
         let sourceNodesNew = [...mappingNodes];
         for (let i = 0; i < mappingNodes.length; i += 1) {
-          if (mappingNodes[i].source.id === mappingId) {
+          if ((isSourceNode && mappingNodes[i].source.id === mappingId) || (!isSourceNode && mappingNodes[i].target.id === mappingId)) {
             let first = mappingNodes[i];
             let second = mappingNodes[i + 1];
             sourceNodesNew[i] = second;
diff --git a/mscr-ui/src/modules/crosswalk-editor/tabs/node-mappings/node-listing-accordion/index.tsx b/mscr-ui/src/modules/crosswalk-editor/tabs/node-mappings/node-listing-accordion/index.tsx
index e82a37bb3..4d446c9df 100644
--- a/mscr-ui/src/modules/crosswalk-editor/tabs/node-mappings/node-listing-accordion/index.tsx
+++ b/mscr-ui/src/modules/crosswalk-editor/tabs/node-mappings/node-listing-accordion/index.tsx
@@ -207,7 +207,7 @@ function Row(props: {
           <div
             className={props.rowCount > 1 ? 'd-flex flex-column justify-content-center' : 'd-flex flex-column justify-content-center d-none'}>
             <div>
-              <Tooltip className={props.index !== 0 && props.isSourceAccordion ? '' : 'd-none'}
+              <Tooltip className={props.index !== 0 ? '' : 'd-none'}
                        title={'Order node up'}
                        placement="left"
               >
@@ -215,8 +215,8 @@ function Row(props: {
                   onClick={() => moveNode(true)}></StyledArrowCircleUp>
               </Tooltip>
             </div>
-            <div className={props.isSourceAccordion ? '' : 'ms-3'}>
-              {props.index !== props.rowCount - 1 && props.rowCount > 1 && props.isSourceAccordion &&
+            <div>
+              {props.index !== props.rowCount - 1 && props.rowCount > 1 &&
                   <Tooltip
                       title={'Order node down'}
                       placement="left"