diff --git a/Neos.Neos/Classes/Controller/Module/Management/WorkspacesController.php b/Neos.Neos/Classes/Controller/Module/Management/WorkspacesController.php
index d0aeeae4dc3..b348c160394 100644
--- a/Neos.Neos/Classes/Controller/Module/Management/WorkspacesController.php
+++ b/Neos.Neos/Classes/Controller/Module/Management/WorkspacesController.php
@@ -470,16 +470,18 @@ protected function computeChangesCount(Workspace $selectedWorkspace)
     {
         $changesCount = ['new' => 0, 'changed' => 0, 'removed' => 0, 'total' => 0];
         foreach ($this->computeSiteChanges($selectedWorkspace) as $siteChanges) {
-            foreach ($siteChanges['documents'] as $documentChanges) {
-                foreach ($documentChanges['changes'] as $change) {
-                    if ($change['node']->isRemoved()) {
-                        $changesCount['removed']++;
-                    } elseif ($change['isNew']) {
-                        $changesCount['new']++;
-                    } else {
-                        $changesCount['changed']++;
-                    };
-                    $changesCount['total']++;
+            foreach ($siteChanges['documents'] as $dimensions) {
+                foreach ($dimensions as $documentChanges) {
+                    foreach ($documentChanges['changes'] as $change) {
+                        if ($change['node']->isRemoved()) {
+                            $changesCount['removed']++;
+                        } elseif ($change['isNew']) {
+                            $changesCount['new']++;
+                        } else {
+                            $changesCount['changed']++;
+                        };
+                        $changesCount['total']++;
+                    }
                 }
             }
         }
@@ -509,11 +511,15 @@ protected function computeSiteChanges(Workspace $selectedWorkspace)
                     // $document will be null if we have a broken root line for this node. This actually should never happen, but currently can in some scenarios.
                     if ($document !== null) {
                         $documentPath = implode('/', array_slice(explode('/', $document->getPath()), 3));
+
+                        $dimensionValues = $document->getDimensions();
+                        $documentDimension = Utility::sortDimensionValueArrayAndReturnDimensionsHash($dimensionValues);
+
                         $relativePath = str_replace(sprintf(SiteService::SITES_ROOT_PATH . '/%s/%s', $siteNodeName, $documentPath), '', $node->getPath());
                         if (!isset($siteChanges[$siteNodeName]['siteNode'])) {
                             $siteChanges[$siteNodeName]['siteNode'] = $this->siteRepository->findOneByNodeName($siteNodeName);
                         }
-                        $siteChanges[$siteNodeName]['documents'][$documentPath]['documentNode'] = $document;
+                        $siteChanges[$siteNodeName]['documents'][$documentDimension][$documentPath]['documentNode'] = $document;
 
                         $change = [
                             'node' => $node,
@@ -522,7 +528,7 @@ protected function computeSiteChanges(Workspace $selectedWorkspace)
                         if ($node->getNodeType()->isOfType('Neos.Neos:Node')) {
                             $change['configuration'] = $node->getNodeType()->getFullConfiguration();
                         }
-                        $siteChanges[$siteNodeName]['documents'][$documentPath]['changes'][$relativePath] = $change;
+                        $siteChanges[$siteNodeName]['documents'][$documentDimension][$documentPath]['changes'][$relativePath] = $change;
                     }
                 }
             }
@@ -534,17 +540,21 @@ protected function computeSiteChanges(Workspace $selectedWorkspace)
 
         ksort($siteChanges);
         foreach ($siteChanges as $siteKey => $site) {
-            foreach ($site['documents'] as $documentKey => $document) {
-                $liveDocumentNode = $liveContext->getNodeByIdentifier($document['documentNode']->getIdentifier());
-                $siteChanges[$siteKey]['documents'][$documentKey]['isMoved'] = $liveDocumentNode && $document['documentNode']->getPath() !== $liveDocumentNode->getPath();
-                $siteChanges[$siteKey]['documents'][$documentKey]['isNew'] = $liveDocumentNode === null;
-                foreach ($document['changes'] as $changeKey => $change) {
-                    $liveNode = $liveContext->getNodeByIdentifier($change['node']->getIdentifier());
-                    $siteChanges[$siteKey]['documents'][$documentKey]['changes'][$changeKey]['isNew'] = is_null($liveNode);
-                    $siteChanges[$siteKey]['documents'][$documentKey]['changes'][$changeKey]['isMoved'] = $liveNode && $change['node']->getPath() !== $liveNode->getPath();
+            foreach ($site['documents'] as $documentDimension => $documentsPerDimension) {
+                foreach ($documentsPerDimension as $documentKey => $document) {
+                    $liveDocumentNode = $liveContext->getNodeByIdentifier($document['documentNode']->getIdentifier());
+                    $siteChanges[$siteKey]['documents'][$documentDimension][$documentKey]['isMoved'] = $liveDocumentNode && $document['documentNode']->getPath() !== $liveDocumentNode->getPath();
+                    $siteChanges[$siteKey]['documents'][$documentDimension][$documentKey]['isNew'] = $liveDocumentNode === null;
+                    foreach ($document['changes'] as $changeKey => $change) {
+                        $liveNode = $liveContext->getNodeByIdentifier($change['node']->getIdentifier());
+                        $siteChanges[$siteKey]['documents'][$documentDimension][$documentKey]['changes'][$changeKey]['isNew'] = is_null($liveNode);
+                        $siteChanges[$siteKey]['documents'][$documentDimension][$documentKey]['changes'][$changeKey]['isMoved'] = $liveNode && $change['node']->getPath() !== $liveNode->getPath();
+                    }
                 }
             }
-            ksort($siteChanges[$siteKey]['documents']);
+            foreach ($siteChanges[$siteKey]['documents'] as $key => $document) {
+                ksort($siteChanges[$siteKey]['documents'][$key]);
+            }
         }
         return $siteChanges;
     }
diff --git a/Neos.Neos/Resources/Private/Templates/Module/Management/Workspaces/Show.html b/Neos.Neos/Resources/Private/Templates/Module/Management/Workspaces/Show.html
index 7dd9032d8b5..9dd10c151b7 100644
--- a/Neos.Neos/Resources/Private/Templates/Module/Management/Workspaces/Show.html
+++ b/Neos.Neos/Resources/Private/Templates/Module/Management/Workspaces/Show.html
@@ -5,7 +5,7 @@
 </f:section>
 
 <f:section name="content">
-
+	
 	<f:if condition="{siteChanges}">
 		<f:then>
 			<f:form action="publishOrDiscardNodes">
@@ -15,37 +15,38 @@
 				<div class="neos-row-fluid">
 					<table class="neos-table">
 						<thead>
-							<tr>
-								<th class="check neos-priority1">
-									<label for="check-all" class="neos-checkbox">
-										<input type="checkbox" id="check-all" /><span></span>
-									</label>
-								</th>
-								<th></th>
-								<th class="neos-action"></th>
-							</tr>
+						<tr>
+							<th class="check neos-priority1">
+								<label for="check-all" class="neos-checkbox">
+									<input type="checkbox" id="check-all" /><span></span>
+								</label>
+							</th>
+							<th></th>
+							<th class="neos-action"></th>
+						</tr>
 						</thead>
 						<tbody>
 						<f:for each="{siteChanges}" as="site">
-							<f:for each="{site.documents}" key="documentPath" as="document">
-								<tr class="neos-document" data-nodepath="{document.documentNode.path}" data-ismoved="{f:if(condition: document.isMoved, then: 'true', else: 'false')}" data-isnew="{f:if(condition: document.isNew, then: 'true', else: 'false')}">
-									<f:if condition="{document.changes -> f:count()} > 1">
-										<f:then>
-											<td class="check neos-priority1">
-												<label for="check-document-{document.documentNode.identifier}" class="neos-checkbox"><f:form.checkbox id="check-document-{document.documentNode.identifier}" class="neos-check-document" value="{document.documentNode.identifier}"/><span></span></label>
-											</td>
-											<td class="neos-priority1 path-caption">
-										</f:then>
-										<f:else>
-											<td colspan="2" class="neos-priority1 path-caption">
-										</f:else>
-									</f:if>
+							<f:for each="{site.documents}" key="dimension" as="dimensions">
+								<f:for each="{dimensions}" key="documentPath" as="document">
+									<tr class="neos-document" data-nodepath="{document.documentNode.path}" data-ismoved="{f:if(condition: document.isMoved, then: 'true', else: 'false')}" data-isnew="{f:if(condition: document.isNew, then: 'true', else: 'false')}">
+										<f:if condition="{document.changes -> f:count()} > 1">
+											<f:then>
+												<td class="check neos-priority1">
+													<label for="check-document-{document.documentNode.identifier}" class="neos-checkbox"><f:form.checkbox id="check-document-{document.documentNode.identifier}" class="neos-check-document" value="{document.documentNode.identifier}"/><span></span></label>
+												</td>
+												<td class="neos-priority1 path-caption">
+											</f:then>
+											<f:else>
+												<td colspan="2" class="neos-priority1 path-caption">
+											</f:else>
+										</f:if>
 										<div class="neos-row-fluid">
 											<div class="neos-span2">
 												{neos:backend.translate(id: 'pathCaption', source: 'Main', package: 'Neos.Neos')}:
 												<f:render partial="Module/Shared/DocumentBreadcrumb" arguments="{node: document.documentNode, showIcon: true}"></f:render>
 											</div>
-
+											
 											<div class="neos-span2 neos-pull-right neos-aRight">
 												<f:if condition="{document.documentNode.removed}">
 													<f:else>
@@ -54,40 +55,41 @@
 												</f:if>
 											</div>
 										</div>
-									</td>
-									<td class="neos-action neos-folder">
-										<i class="fold-toggle fas fa-chevron-up icon-white" data-toggle="fold-{document.documentNode.identifier}"></i>
-									</td>
-								</tr>
-								<f:for each="{document.changes}" key="relativePath" as="change">
-									<tr class="neos-change fold-{document.documentNode.identifier} document-{document.documentNode.identifier}" data-nodepath="{change.node.path}" data-ismoved="{f:if(condition: change.isMoved, then: 'true', else: 'false')}" data-isnew="{f:if(condition: change.isNew, then: 'true', else: 'false')}">
-										<td class="check neos-priority1">
-											<label for="{change.node.identifier}" class="neos-checkbox"><f:form.checkbox name="nodes[]" value="{change.node.contextPath}" id="{change.node.identifier}" /><span></span></label>
 										</td>
-										<td id="change-{change.node.identifier}" {f:render(partial: 'Module/Management/Workspaces/ContentChangeAttributes', arguments: {change: change})} data-neos-toggle="tooltip" data-placement="left" data-container="body">
-											<f:render partial="Module/Management/Workspaces/ContentChangeDiff" arguments="{change: change, contentDimensions: contentDimensions}"/>
+										<td class="neos-action neos-folder">
+											<i class="fold-toggle fas fa-chevron-up icon-white" data-toggle="fold-{document.documentNode.identifier}-{dimension}"></i>
 										</td>
-										<td class="neos-action">
-											<f:if condition="{canPublishToBaseWorkspace}">
-												<f:if condition="{document.isNew}">
-													<f:then>
-														<div class="neos-button neos-disabled neos-button-primary neos-pull-right"
+									</tr>
+									<f:for each="{document.changes}" key="relativePath" as="change">
+										<tr class="neos-change fold-{document.documentNode.identifier}-{dimension} document-{document.documentNode.identifier}" data-nodepath="{change.node.path}" data-ismoved="{f:if(condition: change.isMoved, then: 'true', else: 'false')}" data-isnew="{f:if(condition: change.isNew, then: 'true', else: 'false')}">
+											<td class="check neos-priority1">
+												<label for="{change.node.identifier}-{dimension}" class="neos-checkbox"><f:form.checkbox name="nodes[]" value="{change.node.contextPath}" id="{change.node.identifier}-{dimension}" /><span></span></label>
+											</td>
+											<td id="change-{change.node.identifier}" {f:render(partial: 'Module/Management/Workspaces/ContentChangeAttributes', arguments: {change: change})} data-neos-toggle="tooltip" data-placement="left" data-container="body">
+											<f:render partial="Module/Management/Workspaces/ContentChangeDiff" arguments="{change: change, contentDimensions: contentDimensions}"/>
+											</td>
+											<td class="neos-action">
+												<f:if condition="{canPublishToBaseWorkspace}">
+													<f:if condition="{document.isNew}">
+														<f:then>
+															<div class="neos-button neos-disabled neos-button-primary neos-pull-right"
 																 title="{neos:backend.translate(id: 'cantPublishSingleNodeInNewPage', source: 'Main', package: 'Neos.Neos')}">
-															<i class="fas fa-check icon-white"></i>
-														</div>
-													</f:then>
-													<f:else>
-														<button form="postHelper" formaction="{f:uri.action(action: 'publishNode', arguments: {node: change.node.contextPath, selectedWorkspace: selectedWorkspace})}" type="submit" class="neos-button neos-button-primary neos-pull-right" title="{neos:backend.translate(id: 'publish', source: 'Main', package: 'Neos.Neos')}" data-neos-toggle="tooltip">
-															<i class="fas fa-check icon-white"></i>
-														</button>
-													</f:else>
+																<i class="fas fa-check icon-white"></i>
+															</div>
+														</f:then>
+														<f:else>
+															<button form="postHelper" formaction="{f:uri.action(action: 'publishNode', arguments: {node: change.node.contextPath, selectedWorkspace: selectedWorkspace})}" type="submit" class="neos-button neos-button-primary neos-pull-right" title="{neos:backend.translate(id: 'publish', source: 'Main', package: 'Neos.Neos')}" data-neos-toggle="tooltip">
+																<i class="fas fa-check icon-white"></i>
+															</button>
+														</f:else>
+													</f:if>
 												</f:if>
-											</f:if>
-											<button form="postHelper" formaction="{f:uri.action(action: 'discardNode', arguments: {node: change.node.contextPath, selectedWorkspace: selectedWorkspace})}" type="submit" class="neos-button neos-button-danger neos-pull-right" title="{neos:backend.translate(id: 'discard', source: 'Main', package: 'Neos.Neos')}" data-neos-toggle="tooltip" data-placement="bottom">
-												<i class="fas fa-trash-alt icon-white"></i>
-											</button>
-										</td>
-									</tr>
+												<button form="postHelper" formaction="{f:uri.action(action: 'discardNode', arguments: {node: change.node.contextPath, selectedWorkspace: selectedWorkspace})}" type="submit" class="neos-button neos-button-danger neos-pull-right" title="{neos:backend.translate(id: 'discard', source: 'Main', package: 'Neos.Neos')}" data-neos-toggle="tooltip" data-placement="bottom">
+													<i class="fas fa-trash-alt icon-white"></i>
+												</button>
+											</td>
+										</tr>
+									</f:for>
 								</f:for>
 							</f:for>
 						</f:for>
@@ -96,7 +98,7 @@
 				</div>
 				<f:render section="actions" arguments="{_all}" />
 			</f:form>
-
+			
 			<div class="neos-hide" id="discard">
 				<div class="neos-modal-centered">
 					<div class="neos-modal-content">
@@ -115,60 +117,60 @@
 				</div>
 				<div class="neos-modal-backdrop neos-in"></div>
 			</div>
-
+			
 			<f:form action="index" id="postHelper" method="post"></f:form>
-
+			
 			<script>
-				window.addEventListener('DOMContentLoaded', (event) => {
-					jQuery(function($) {
-						jQuery('#check-all').change(function() {
-							var value = false;
-							if (jQuery(this).is(':checked')) {
-								value = true;
-								jQuery('.batch-action').removeClass('neos-hidden').removeClass('neos-disabled').removeAttr('disabled');
-							} else {
-								jQuery('.batch-action').addClass('neos-hidden').addClass('neos-disabled').attr('disabled', 'disabled');
-							}
-							jQuery('tbody input[type="checkbox"]').prop('checked', value);
-						});
+                window.addEventListener('DOMContentLoaded', (event) => {
+                    jQuery(function($) {
+                        jQuery('#check-all').change(function() {
+                            var value = false;
+                            if (jQuery(this).is(':checked')) {
+                                value = true;
+                                jQuery('.batch-action').removeClass('neos-hidden').removeClass('neos-disabled').removeAttr('disabled');
+                            } else {
+                                jQuery('.batch-action').addClass('neos-hidden').addClass('neos-disabled').attr('disabled', 'disabled');
+                            }
+                            jQuery('tbody input[type="checkbox"]').prop('checked', value);
+                        });
 
-						jQuery('.neos-check-document').change(function() {
-							var documentIdentifier = jQuery(this).val();
-							var checked = jQuery(this).prop('checked');
-							jQuery(this).closest('table').find('tr.neos-change.document-' + documentIdentifier + ' td.check input').prop('checked', checked);
-						});
+                        jQuery('.neos-check-document').change(function() {
+                            var documentIdentifier = jQuery(this).val();
+                            var checked = jQuery(this).prop('checked');
+                            jQuery(this).closest('table').find('tr.neos-change.document-' + documentIdentifier + ' td.check input').prop('checked', checked);
+                        });
 
-						jQuery('tbody input[type="checkbox"]').change(function() {
-							if (jQuery(this).closest('tr').data('ismoved') === true || jQuery(this).closest('tr').data('isnew') === true) {
-								var currentNodePath = jQuery(this).closest('tr').attr('data-nodepath') + '/';
-								var checked = jQuery(this).prop('checked');
+                        jQuery('tbody input[type="checkbox"]').change(function() {
+                            if (jQuery(this).closest('tr').data('ismoved') === true || jQuery(this).closest('tr').data('isnew') === true) {
+                                var currentNodePath = jQuery(this).closest('tr').attr('data-nodepath') + '/';
+                                var checked = jQuery(this).prop('checked');
 
-								function nodePathStartsWith(nodePath) {
-									return function(index, element) {
-										return nodePath.indexOf(jQuery(element).data('nodepath')) === 0;
-									}
-								}
-								var movedOrNewParentDocuments = jQuery(this).closest('table').find('.neos-document[data-ismoved="true"], .neos-document[data-isnew="true"]').filter(nodePathStartsWith(currentNodePath));
-								jQuery(movedOrNewParentDocuments).each(function(index, movedParentDocument) {
-									jQuery('tr[data-nodepath^="' + jQuery(movedParentDocument).data('nodepath') + '"] td.check input').prop('checked', checked);
-								});
-							}
+                                function nodePathStartsWith(nodePath) {
+                                    return function(index, element) {
+                                        return nodePath.indexOf(jQuery(element).data('nodepath')) === 0;
+                                    }
+                                }
+                                var movedOrNewParentDocuments = jQuery(this).closest('table').find('.neos-document[data-ismoved="true"], .neos-document[data-isnew="true"]').filter(nodePathStartsWith(currentNodePath));
+                                jQuery(movedOrNewParentDocuments).each(function(index, movedParentDocument) {
+                                    jQuery('tr[data-nodepath^="' + jQuery(movedParentDocument).data('nodepath') + '"] td.check input').prop('checked', checked);
+                                });
+                            }
 
-							if (jQuery('tbody input[type="checkbox"]:checked').length > 0) {
-								jQuery('.batch-action').removeClass('neos-hidden').removeClass('neos-disabled').removeAttr('disabled')
-							} else {
-								jQuery('.batch-action').addClass('neos-hidden').addClass('neos-disabled').attr('disabled', 'disabled');
-							}
-						});
+                            if (jQuery('tbody input[type="checkbox"]:checked').length > 0) {
+                                jQuery('.batch-action').removeClass('neos-hidden').removeClass('neos-disabled').removeAttr('disabled')
+                            } else {
+                                jQuery('.batch-action').addClass('neos-hidden').addClass('neos-disabled').attr('disabled', 'disabled');
+                            }
+                        });
 
-						jQuery('.fold-toggle').click(function() {
-							jQuery(this).toggleClass('fas fa-chevron-down fas fa-chevron-up');
-							jQuery('tr.' + jQuery(this).data('toggle')).toggle();
-						});
-					});
-				});
+                        jQuery('.fold-toggle').click(function() {
+                            jQuery(this).toggleClass('fas fa-chevron-down fas fa-chevron-up');
+                            jQuery('tr.' + jQuery(this).data('toggle')).toggle();
+                        });
+                    });
+                });
 			</script>
-
+		
 		</f:then>
 		<f:else>
 			<legend>{neos:backend.translate(id: 'workspaces.unpublishedChanges', source: 'Modules', package: 'Neos.Neos', arguments: {0: selectedWorkspaceLabel})}</legend>