diff --git a/src/app/components/info-drawer/info-drawer.component.html b/src/app/components/info-drawer/info-drawer.component.html
index 99468992f..f6f75fe03 100644
--- a/src/app/components/info-drawer/info-drawer.component.html
+++ b/src/app/components/info-drawer/info-drawer.component.html
@@ -1,7 +1,7 @@
 <div *ngIf="isLoading">
     <mat-progress-bar mode="indeterminate"></mat-progress-bar>
 </div>
-<ng-container *ngIf="node">
+<ng-container *ngIf="!isLoading && !!displayNode">
     <adf-info-drawer [title]="'APP.INFO_DRAWER.TITLE' | translate">
         <adf-info-drawer-tab [label]="'APP.INFO_DRAWER.TABS.PROPERTIES' | translate">
             <adf-content-metadata-card
diff --git a/src/app/components/info-drawer/info-drawer.component.ts b/src/app/components/info-drawer/info-drawer.component.ts
index df3b064f8..334a01080 100644
--- a/src/app/components/info-drawer/info-drawer.component.ts
+++ b/src/app/components/info-drawer/info-drawer.component.ts
@@ -55,7 +55,12 @@ export class InfoDrawerComponent implements OnChanges {
 
     get isFileSelected(): boolean {
         if (this.node && this.node.entry) {
-            return this.node.entry.isFile;
+            // workaround for shared files type.
+            if (this.node.entry.nodeId) {
+                return true;
+            } else {
+                return this.node.entry.isFile;
+            }
         }
         return false;
     }