diff --git a/Neos.Workspace.Ui/Classes/Controller/WorkspaceController.php b/Neos.Workspace.Ui/Classes/Controller/WorkspaceController.php
index c462b801a91..e4bb4833a21 100644
--- a/Neos.Workspace.Ui/Classes/Controller/WorkspaceController.php
+++ b/Neos.Workspace.Ui/Classes/Controller/WorkspaceController.php
@@ -288,14 +288,14 @@ public function editAction(WorkspaceName $workspaceName): void
      * @param WorkspaceName $workspaceName
      * @param WorkspaceTitle $title Human friendly title of the workspace, for example "Christmas Campaign"
      * @param WorkspaceDescription $description A description explaining the purpose of the new workspace
-     * @param string $workspaceOwner Id of the owner of the workspace
+     * @param string|null $workspaceOwner Id of the owner of the workspace
      * @return void
      */
     public function updateAction(
         WorkspaceName $workspaceName,
         WorkspaceTitle $title,
         WorkspaceDescription $description,
-        ?string $workspaceOwner
+        ?string $workspaceOwner = null
     ): void {
         $contentRepositoryId = SiteDetectionResult::fromRequest($this->request->getHttpRequest())
             ->contentRepositoryId;
diff --git a/Neos.Workspace.Ui/Configuration/Views.yaml b/Neos.Workspace.Ui/Configuration/Views.yaml
index 2371306a213..dccdf779490 100644
--- a/Neos.Workspace.Ui/Configuration/Views.yaml
+++ b/Neos.Workspace.Ui/Configuration/Views.yaml
@@ -5,7 +5,7 @@
       - 'resource://Neos.Workspace.Ui/Private/Partials'
       - 'resource://Neos.Neos/Private/Partials'
 
-- requestFilter: 'isPackage("Neos.Workspace.Ui") && isController("Workspace") && isFormat("html") && (isAction("index") || isAction("new"))'
+- requestFilter: 'isPackage("Neos.Workspace.Ui") && isController("Workspace") && isFormat("html") && (isAction("index") || isAction("new") || isAction("edit"))'
   viewObjectName: 'Neos\Fusion\View\FusionView'
   options:
     fusionPathPatterns:
diff --git a/Neos.Workspace.Ui/Resources/Private/Fusion/Components/WorkspaceTableRow.fusion b/Neos.Workspace.Ui/Resources/Private/Fusion/Components/WorkspaceTableRow.fusion
index 9726e28edf8..ca221982d63 100644
--- a/Neos.Workspace.Ui/Resources/Private/Fusion/Components/WorkspaceTableRow.fusion
+++ b/Neos.Workspace.Ui/Resources/Private/Fusion/Components/WorkspaceTableRow.fusion
@@ -50,6 +50,12 @@ prototype(Neos.Workspace.Ui:Component.WorkspaceTableRow) < prototype(Neos.Fusion
         workspace = ${props.workspaceName}
       }
     }
+    editWorkspaceUri = Neos.Fusion:UriBuilder {
+      action = 'edit'
+      arguments {
+        workspaceName = ${props.workspaceName}
+      }
+    }
   }
 
   renderer = afx`
@@ -81,15 +87,14 @@ prototype(Neos.Workspace.Ui:Component.WorkspaceTableRow) < prototype(Neos.Fusion
           <i
             class="fas fa-review"></i> {I18n.translate('table.column.action.show', 'Show', [], 'Main', 'Neos.Workspace.Ui')}
         </a>
-        <button
+        <a
           class="neos-button"
-          type="button"
           title={I18n.translate('table.column.action.edit', 'Edit workspace ' + workspace.title, {workspace: workspace.title}, 'Main', 'Neos.Workspace.Ui')}
-          onClick=""
-          disabled={!props.canManage || props.workspaceData.changesCounts == null}
+          href={private.editWorkspaceUri}
+          @if={!props.canManage || props.workspaceData.changesCounts == null}
         >
           <i class="fas fa-pencil-alt"></i>
-        </button>
+        </a>
         <button
           class="neos-button neos-button-danger"
           title={I18n.translate('workspaces.deleteWorkspace', 'Delete workspace', [], 'Main', 'Neos.Workspace.Ui')}
diff --git a/Neos.Workspace.Ui/Resources/Private/Fusion/Views/Edit.fusion b/Neos.Workspace.Ui/Resources/Private/Fusion/Views/Edit.fusion
new file mode 100644
index 00000000000..4acbbbe15a3
--- /dev/null
+++ b/Neos.Workspace.Ui/Resources/Private/Fusion/Views/Edit.fusion
@@ -0,0 +1,147 @@
+Neos.Workspace.Ui.WorkspaceController.edit = Neos.Fusion:Component {
+  flashMessages = ${flashMessages}
+  baseWorkspaceOptions = ${baseWorkspaceOptions}
+  showOwnerSelector = ${showOwnerSelector}
+  ownerOptions = ${ownerOptions}
+  workspace = ${workspace}
+  i18n = ${I18n.id('').source('Main').package('Neos.Workspace.Ui')}
+
+  prototype(Neos.Fusion.Form:LabelRenderer) {
+    translationPackage = 'Neos.Workspace.Ui'
+    translationSource = 'Main'
+  }
+
+  prototype(Neos.Fusion.Form:Neos.BackendModule.FieldContainer) {
+    translation.label {
+      package = 'Neos.Workspace.Ui'
+      source = 'Main'
+    }
+  }
+
+  renderer = afx`
+    <Neos.Workspace.Ui:Component.FlashMessages flashMessages={props.flashMessages}/>
+    <main>
+      <h2>{props.i18n.id('workspaces.editWorkspace').arguments([props.workspace.workspaceTitle.value])}</h2>
+      <Neos.Fusion.Form:Form form.target.action="update">
+        <Neos.Fusion.Form:Hidden
+          field.name="workspaceName"
+          field.value={props.workspace.workspaceName.value}
+        />
+        <fieldset>
+          <Neos.Fusion.Form:Neos.BackendModule.FieldContainer
+            field.name="title"
+            field.value={props.workspace.workspaceTitle.value}
+            label="workspaces.workspace.title"
+            class="neos-control-group"
+          >
+            <Neos.Fusion.Form:Textfield
+              attributes.required
+              attributes.pattern="/^[\p{L}\p{P}\d \.]{1,200}$/u"
+              attributes.autofocus
+            />
+          </Neos.Fusion.Form:Neos.BackendModule.FieldContainer>
+
+          <Neos.Fusion.Form:Neos.BackendModule.FieldContainer
+            field.name="description"
+            field.value={props.workspace.workspaceDescription.value}
+            label="workspaces.workspace.description"
+            class="neos-control-group"
+          >
+            <Neos.Fusion.Form:Textfield
+              attributes.pattern="/^[\p{L}\p{P}\d \.]{0,500}$/u"
+            />
+          </Neos.Fusion.Form:Neos.BackendModule.FieldContainer>
+
+          <Neos.Fusion.Form:Neos.BackendModule.FieldContainer
+            field.name="baseWorkspace"
+            field.value={props.workspace.baseWorkspaceName.value}
+            label="workspaces.workspace.baseWorkspace"
+            class="neos-control-group"
+          >
+            <Neos.Fusion.Form:Select
+              attributes.disabled
+            >
+              <Neos.Fusion:Loop items={props.baseWorkspaceOptions} itemName="workspaceTitle" itemKey="workspaceName">
+                <Neos.Fusion.Form:Select.Option
+                  option.value={workspaceName}
+                  attributes.selected={workspaceName == props.workspace.baseWorkspaceName.value}
+                >
+                  {workspaceTitle}
+                </Neos.Fusion.Form:Select.Option>
+              </Neos.Fusion:Loop>
+            </Neos.Fusion.Form:Select>
+          </Neos.Fusion.Form:Neos.BackendModule.FieldContainer>
+
+          <Neos.Fusion.Form:Neos.BackendModule.FieldContainer
+            field.name="workspaceOwner"
+            field.value={props.workspace.baseWorkspaceName.value}
+            label="workspaces.workspace.owner"
+            class="neos-control-group"
+            @if={props.showOwnerSelector}
+          >
+            <Neos.Fusion.Form:Select
+              field.value={props.workspace.baseWorkspaceName.value}
+            >
+              <Neos.Fusion:Loop items={props.ownerOptions} itemName="ownerTitle" itemKey="ownerName">
+                <Neos.Fusion.Form:Select.Option option.value={ownerName}>
+                  {ownerTitle}
+                </Neos.Fusion.Form:Select.Option>
+              </Neos.Fusion:Loop>
+            </Neos.Fusion.Form:Select>
+          </Neos.Fusion.Form:Neos.BackendModule.FieldContainer>
+        </fieldset>
+        <fieldset>
+          <Neos.Fusion:Fragment
+            @if={Security.hasAccess('Neos.Workspace.Ui:Backend.Module.Management.Workspace.ManageInternalWorkspaces')}>
+            <h3 class="neos-control-label">
+              {props.i18n.id('workspaces.workspace.visibility')}
+            </h3>
+            <Neos.Fusion.Form:Neos.BackendModule.FieldContainer
+              class="neos-control-group"
+            >
+              <Neos.Fusion.Form:Radio
+                id="visibility.private"
+                field.value="private"
+                attributes.disabled
+                attributes.checked={props.workspace.privateWorkspace}
+              >
+                <span></span>
+                <span>
+                  {props.i18n.id('workspaces.workspace.visibility.private')}
+                  <span class="neos-help-inline">
+                    {props.i18n.id('workspaces.workspace.visibility.private.help')}
+                  </span>
+                </span>
+              </Neos.Fusion.Form:Radio>
+              <br/>
+              <Neos.Fusion.Form:Radio
+                id="visibility.internal"
+                field.value="internal"
+                attributes.disabled
+                attributes.checked={props.workspace.internalWorkspace}
+              >
+                <span></span>
+                <span>
+                  {props.i18n.id('workspaces.workspace.visibility.internal')}
+                  <span class="neos-help-inline">
+                    {props.i18n.id('workspaces.workspace.visibility.internal.help')}
+                  </span>
+                </span>
+              </Neos.Fusion.Form:Radio>
+            </Neos.Fusion.Form:Neos.BackendModule.FieldContainer>
+          </Neos.Fusion:Fragment>
+
+          <Neos.Fusion.Form:Button attributes.class="neos-button neos-button-primary">
+            {props.i18n.id('applyChanges')}
+          </Neos.Fusion.Form:Button>
+        </fieldset>
+      </Neos.Fusion.Form:Form>
+
+      <Neos.Workspace.Ui:Component.Footer>
+        <Neos.Fusion:Link.Action href.action="index" class="neos-button">
+          {props.i18n.id('cancel')}
+        </Neos.Fusion:Link.Action>
+      </Neos.Workspace.Ui:Component.Footer>
+    </main>
+  `
+}
diff --git a/Neos.Workspace.Ui/Resources/Private/Fusion/Views/New.fusion b/Neos.Workspace.Ui/Resources/Private/Fusion/Views/New.fusion
index 23009730452..6f46267059b 100644
--- a/Neos.Workspace.Ui/Resources/Private/Fusion/Views/New.fusion
+++ b/Neos.Workspace.Ui/Resources/Private/Fusion/Views/New.fusion
@@ -39,7 +39,9 @@ Neos.Workspace.Ui.WorkspaceController.new = Neos.Fusion:Component {
             label="workspaces.workspace.description"
             class="neos-control-group"
           >
-            <Neos.Fusion.Form:Textarea attributes.rows={3} />
+            <Neos.Fusion.Form:Textfield
+              attributes.pattern="/^[\p{L}\p{P}\d \.]{0,500}$/u"
+            />
           </Neos.Fusion.Form:Neos.BackendModule.FieldContainer>
 
           <Neos.Fusion.Form:Neos.BackendModule.FieldContainer
diff --git a/Neos.Workspace.Ui/Resources/Private/Templates/Workspace/Edit.html b/Neos.Workspace.Ui/Resources/Private/Templates/Workspace/Edit.html
deleted file mode 100644
index 1307f394d60..00000000000
--- a/Neos.Workspace.Ui/Resources/Private/Templates/Workspace/Edit.html
+++ /dev/null
@@ -1,65 +0,0 @@
-{namespace neos=Neos\Neos\ViewHelpers}
-<f:layout name="BackendSubModule"/>
-
-<f:section name="subtitle">
-	<h2>{neos:backend.translate(id: 'workspaces.editWorkspace', source: 'Main', package: 'Neos.Workspace.Ui', arguments: {0: workspace.workspaceTitle.value})}</h2>
-</f:section>
-
-<f:section name="content">
-	<f:form action="update" name="workspace">
-		<f:form.hidden name="workspaceName" value="{workspace.workspaceName.value}"/>
-		<fieldset>
-			<div class="neos-control-group">
-				<label class="neos-control-label" for="title">{neos:backend.translate(id: 'workspaces.workspace.title', source: 'Main', package: 'Neos.Workspace.Ui')}</label>
-				<div class="neos-controls">
-					<f:form.textfield name="title" value="{workspace.workspaceTitle.value}" id="title" class="neos-span3" autofocus="true" required="required" maxlength="200" />
-				</div>
-			</div>
-
-			<div class="neos-control-group">
-				<label class="neos-control-label" for="description">{neos:backend.translate(id: 'workspaces.workspace.description', source: 'Main', package: 'Neos.Workspace.Ui')}</label>
-				<div class="neos-controls">
-					<f:form.textfield name="description" value="{workspace.workspaceDescription.value}" id="description" class="neos-span10"/>
-				</div>
-			</div>
-
-			<div class="neos-control-group{f:validation.ifHasErrors(for: 'baseWorkspace', then: ' neos-error')}">
-				<label class="neos-control-label" for="baseWorkspace">{neos:backend.translate(id: 'workspaces.workspace.baseWorkspace', source: 'Main', package: 'Neos.Workspace.Ui')}</label>
-				<div class="neos-controls">
-					<f:form.select name="baseWorkspace" value="{workspace.baseWorkspaceName.value}" id="baseWorkspace" options="{baseWorkspaceOptions}" disabled="disabled" title="{neos:backend.translate(id: 'workspaces.help.cantRebaseWorkspaceContainsChanges', source: 'Main', package: 'Neos.Workspace.Ui')}" />
-				</div>
-			</div>
-
-			<f:if condition="{showOwnerSelector}">
-				<div class="neos-control-group">
-					<label class="neos-control-label" for="owner">{neos:backend.translate(id: 'workspaces.workspace.owner', source: 'Main', package: 'Neos.Workspace.Ui')}</label>
-					<div class="neos-controls">
-						<f:form.select name="workspaceOwner" value="{workspace.workspaceOwner}" id="owner" options="{ownerOptions}" />
-					</div>
-				</div>
-			</f:if>
-
-			<div class="neos-control-group">
-				<label class="neos-control-label">{neos:backend.translate(id: 'workspaces.workspace.visibility', source: 'Main', package: 'Neos.Workspace.Ui')}</label>
-				<div class="neos-controls">
-					<label for="visibility.private" class="neos-radio">
-						<f:form.radio name="visibility" id="visibility.private" value="private" disabled="true" checked="{workspace.privateWorkspace}" /><span></span>
-						<span>{neos:backend.translate(id: 'workspaces.workspace.visibility.private', source: 'Main', package: 'Neos.Workspace.Ui')} <span class="neos-help-inline">{neos:backend.translate(id: 'workspaces.workspace.visibility.private.help', source: 'Main', package: 'Neos.Workspace.Ui')}</span></span>
-					</label>
-				</div>
-				<div class="neos-controls">
-					<label for="visibility.internal" class="neos-radio">
-						<f:form.radio name="visibility" id="visibility.internal" value="internal" disabled="true" checked="{workspace.internalWorkspace}"/><span></span>
-						<span>{neos:backend.translate(id: 'workspaces.workspace.visibility.internal', source: 'Main', package: 'Neos.Workspace.Ui')} <span class="neos-help-inline">{neos:backend.translate(id: 'workspaces.workspace.visibility.internal.help', source: 'Main', package: 'Neos.Workspace.Ui')}</span></span>
-					</label>
-				</div>
-			</div>
-		</fieldset>
-
-		<div class="neos-footer">
-			<f:link.action action="index" class="neos-button">{neos:backend.translate(id: 'cancel', package: 'Neos.Workspace.Ui')}
-			</f:link.action>
-			<f:form.submit value="{neos:backend.translate(id: 'applyChanges')}" class="neos-button neos-button-primary"/>
-		</div>
-	</f:form>
-</f:section>
diff --git a/Neos.Workspace.Ui/Resources/Private/Translations/en/Main.xlf b/Neos.Workspace.Ui/Resources/Private/Translations/en/Main.xlf
index 8786d9093b1..7f6832dd9b1 100644
--- a/Neos.Workspace.Ui/Resources/Private/Translations/en/Main.xlf
+++ b/Neos.Workspace.Ui/Resources/Private/Translations/en/Main.xlf
@@ -8,6 +8,9 @@
       <trans-unit id="cancel" xml:space="preserve">
 				<source>Cancel</source>
 			</trans-unit>
+      <trans-unit id="applyChanges" xml:space="preserve">
+				<source>Apply changes</source>
+			</trans-unit>
       <trans-unit id="pathCaption" xml:space="preserve">
 				<source>Path</source>
 			</trans-unit>