diff --git a/src/app/common/directives/node-versions.directive.ts b/src/app/common/directives/node-versions.directive.ts
index e52ccdd15..2e1bcb30a 100644
--- a/src/app/common/directives/node-versions.directive.ts
+++ b/src/app/common/directives/node-versions.directive.ts
@@ -25,7 +25,7 @@
 
 import { Directive, EventEmitter, HostListener, Input, Output } from '@angular/core';
 
-import { TranslationService, NotificationService } from '@alfresco/adf-core';
+import { TranslationService, NotificationService, AlfrescoApiService } from '@alfresco/adf-core';
 import { MinimalNodeEntity } from 'alfresco-js-api';
 
 import { VersionManagerDialogAdapterComponent } from '../../components/versions-dialog/version-manager-dialog-adapter.component';
@@ -48,14 +48,27 @@ export class NodeVersionsDirective {
     }
 
     constructor(
+        private apiService: AlfrescoApiService,
         private dialog: MatDialog,
         private notification: NotificationService,
         private translation: TranslationService
     ) {}
 
     onManageVersions() {
-        const contentEntry = this.selection[this.selection.length - 1].entry;
+        const contentEntry = this.selection[0].entry;
+        const nodeId = (<any>contentEntry).nodeId;
 
+        if (nodeId) {
+            // get the node entry that was shared:
+            this.apiService.getInstance().nodes.getNodeInfo(nodeId).then(entry => this.openVersionManagerDialog(entry));
+
+        } else {
+            this.openVersionManagerDialog(contentEntry);
+        }
+
+    }
+
+    openVersionManagerDialog(contentEntry) {
         if (contentEntry.isFile) {
             this.dialog.open(
                 VersionManagerDialogAdapterComponent,
diff --git a/src/app/components/favorites/favorites.component.html b/src/app/components/favorites/favorites.component.html
index ec67b466a..68b6d6a64 100644
--- a/src/app/components/favorites/favorites.component.html
+++ b/src/app/components/favorites/favorites.component.html
@@ -81,6 +81,7 @@
 
                 <button
                     mat-menu-item
+                    *ngIf="isFileSelected(documentList.selection)"
                     [app-node-versions]="documentList.selection">
                     <mat-icon>storage</mat-icon>
                     <span>{{ 'APP.ACTIONS.VERSIONS' | translate }}</span>
diff --git a/src/app/components/page.component.ts b/src/app/components/page.component.ts
index 16b553a2c..ef23a06ab 100644
--- a/src/app/components/page.component.ts
+++ b/src/app/components/page.component.ts
@@ -136,13 +136,20 @@ export abstract class PageComponent {
         return this.isFileSelected(selection);
     }
 
-    canManageVersions(selection: Array<MinimalNodeEntity>): boolean {
-        const lastItem = selection.length && selection[selection.length - 1].entry;
-        return lastItem && lastItem.isFile && this.userHasPermissionToManageVersions(lastItem);
+    canUpdateFile(selection: Array<MinimalNodeEntity>): boolean {
+        return this.isFileSelected(selection) && this.nodeHasPermission(selection[0].entry, 'update');
     }
 
-    userHasPermissionToManageVersions(nodeEntry): boolean {
-        return this.nodeHasPermission(nodeEntry, 'update');
+    canUpdateFileShared(selection: Array<MinimalNodeEntity>): boolean {
+        return this.isFileSelected(selection) && this.nodeSharedHasPermission(selection[0].entry, 'update');
+    }
+
+    canManageVersions(selection: Array<MinimalNodeEntity>): boolean {
+        return this.canUpdateFile(selection);
+    }
+
+    canManageVersionsOfShared(selection: Array<MinimalNodeEntity>): boolean {
+        return this.canUpdateFileShared(selection);
     }
 
     nodeHasPermission(node: MinimalNodeEntryEntity, permission: string): boolean {
diff --git a/src/app/components/shared-files/shared-files.component.html b/src/app/components/shared-files/shared-files.component.html
index 829ae16ef..c262aaa4c 100644
--- a/src/app/components/shared-files/shared-files.component.html
+++ b/src/app/components/shared-files/shared-files.component.html
@@ -83,7 +83,7 @@
 
                 <button
                     mat-menu-item
-                    *ngIf="canManageVersions(documentList.selection)"
+                    *ngIf="canManageVersionsOfShared(documentList.selection)"
                     [app-node-versions]="documentList.selection">
                     <mat-icon>storage</mat-icon>
                     <span>{{ 'APP.ACTIONS.VERSIONS' | translate }}</span>