diff --git a/libs/ui/src/lib/activities-table/activities-table.component.html b/libs/ui/src/lib/activities-table/activities-table.component.html
index 8d1f458a9..e230c0bcd 100644
--- a/libs/ui/src/lib/activities-table/activities-table.component.html
+++ b/libs/ui/src/lib/activities-table/activities-table.component.html
@@ -437,12 +437,7 @@
           class="no-max-width"
           xPosition="before"
         >
-          @if (
-            hasPermissionToOpenDetails &&
-            isExcludedFromAnalysis(element) === false &&
-            element.isDraft === false &&
-            ['BUY', 'DIVIDEND', 'SELL'].includes(element.type)
-          ) {
+          @if (canClickActivity(element)) {
             <button mat-menu-item (click)="onClickActivity(element)">
               <span class="align-items-center d-flex">
                 <ion-icon class="mr-2" name="wallet-outline" />
@@ -492,11 +487,7 @@
       *matRowDef="let row; columns: displayedColumns"
       mat-row
       [ngClass]="{
-        'cursor-pointer':
-          hasPermissionToOpenDetails &&
-          isExcludedFromAnalysis(row) === false &&
-          row.isDraft === false &&
-          ['BUY', 'DIVIDEND', 'SELL'].includes(row.type)
+        'cursor-pointer': canClickActivity(row)
       }"
       (click)="onClickActivity(row)"
     ></tr>
diff --git a/libs/ui/src/lib/activities-table/activities-table.component.ts b/libs/ui/src/lib/activities-table/activities-table.component.ts
index 01d3a8c4a..895eb0e42 100644
--- a/libs/ui/src/lib/activities-table/activities-table.component.ts
+++ b/libs/ui/src/lib/activities-table/activities-table.component.ts
@@ -246,12 +246,7 @@ export class GfActivitiesTableComponent
       if (!activity.error) {
         this.selectedRows.toggle(activity);
       }
-    } else if (
-      this.hasPermissionToOpenDetails &&
-      this.isExcludedFromAnalysis(activity) === false &&
-      activity.isDraft === false &&
-      ['BUY', 'DIVIDEND', 'SELL'].includes(activity.type)
-    ) {
+    } else if (this.canClickActivity(activity)) {
       this.activityClicked.emit({
         dataSource: activity.SymbolProfile.dataSource,
         symbol: activity.SymbolProfile.symbol
@@ -259,6 +254,15 @@ export class GfActivitiesTableComponent
     }
   }
 
+  public canClickActivity(activity: Activity) {
+    return (
+      this.hasPermissionToOpenDetails &&
+      this.isExcludedFromAnalysis(activity) === false &&
+      activity.isDraft === false &&
+      ['BUY', 'DIVIDEND', 'SELL'].includes(activity.type)
+    );
+  }
+
   public onCloneActivity(aActivity: OrderWithAccount) {
     this.activityToClone.emit(aActivity);
   }