diff --git a/e2e/protractor.excludes.json b/e2e/protractor.excludes.json
index 4c1f2513ad5..f832f46b397 100644
--- a/e2e/protractor.excludes.json
+++ b/e2e/protractor.excludes.json
@@ -5,10 +5,6 @@
   "C362241": "Include once ADF starts using ACS 7, https://issues.alfresco.com/jira/browse/ADF-5182",
   "C362242": "Include once ADF starts using ACS 7, https://issues.alfresco.com/jira/browse/ADF-5182",
   "C362265": "Include once ADF starts using ACS 7, https://issues.alfresco.com/jira/browse/ADF-5182",
-  "C311287": "https://issues.alfresco.com/jira/browse/AAE-3200",
-  "C260140": "https://issues.alfresco.com/jira/browse/AAE-3200",
-  "C261160": "https://issues.alfresco.com/jira/browse/AAE-3200",
-  "C246534": "https://issues.alfresco.com/jira/browse/AAE-3200",
   "C310358": "Include once process storage services removed, https://issues.alfresco.com/jira/browse/AAE-3177",
   "C311290": "Include once process storage services removed, https://issues.alfresco.com/jira/browse/AAE-3177"
 }
diff --git a/lib/content-services/src/lib/content-node-selector/content-node-selector.component.html b/lib/content-services/src/lib/content-node-selector/content-node-selector.component.html
index 4f7e190fa0f..2cf8c7fbd31 100644
--- a/lib/content-services/src/lib/content-node-selector/content-node-selector.component.html
+++ b/lib/content-services/src/lib/content-node-selector/content-node-selector.component.html
@@ -44,7 +44,7 @@ <h2>{{title}}</h2>
         </button>
 
         <button mat-button
-                [disabled]="!chosenNode"
+                [disabled]="!hasNodeSelected()"
                 class="adf-choose-action"
                 (click)="onClick()"
                 data-automation-id="content-node-selector-actions-choose">{{ buttonActionName | translate }}
diff --git a/lib/content-services/src/lib/content-node-selector/content-node-selector.component.spec.ts b/lib/content-services/src/lib/content-node-selector/content-node-selector.component.spec.ts
index 3a590d974d7..92f55704983 100644
--- a/lib/content-services/src/lib/content-node-selector/content-node-selector.component.spec.ts
+++ b/lib/content-services/src/lib/content-node-selector/content-node-selector.component.spec.ts
@@ -161,6 +161,22 @@ describe('ContentNodeSelectorDialogComponent', () => {
             const actionButton = fixture.debugElement.query(By.css('[data-automation-id="content-node-selector-actions-choose"]'));
             expect(actionButton.nativeElement.disabled).toBeFalsy();
         });
+
+        it('should be disabled when no node chosen', () => {
+            component.onSelect([new Node({ id: 'fake' })]);
+            fixture.detectChanges();
+
+            const actionButtonWithNodeSelected = fixture.debugElement.query(By.css('[data-automation-id="content-node-selector-actions-choose"]'));
+
+            expect(actionButtonWithNodeSelected.nativeElement.disabled).toBe(false);
+
+            component.onSelect([]);
+            fixture.detectChanges();
+
+            const actionButtonWithoutNodeSelected = fixture.debugElement.query(By.css('[data-automation-id="content-node-selector-actions-choose"]'));
+
+            expect(actionButtonWithoutNodeSelected.nativeElement.disabled).toBe(true);
+        });
     });
 
     describe('Title', () => {
diff --git a/lib/content-services/src/lib/content-node-selector/content-node-selector.component.ts b/lib/content-services/src/lib/content-node-selector/content-node-selector.component.ts
index d89311b0eb8..392e208050c 100644
--- a/lib/content-services/src/lib/content-node-selector/content-node-selector.component.ts
+++ b/lib/content-services/src/lib/content-node-selector/content-node-selector.component.ts
@@ -82,4 +82,8 @@ export class ContentNodeSelectorComponent {
     onError(error) {
         this.notificationService.showError(error);
     }
+
+    hasNodeSelected(): boolean {
+        return this.chosenNode?.length > 0;
+    }
 }