diff --git a/tdrive/frontend/src/app/views/client/body/drive/browser.tsx b/tdrive/frontend/src/app/views/client/body/drive/browser.tsx
index 3c3ba6df..fa359ad6 100644
--- a/tdrive/frontend/src/app/views/client/body/drive/browser.tsx
+++ b/tdrive/frontend/src/app/views/client/body/drive/browser.tsx
@@ -217,6 +217,7 @@ export default memo(
         onCheck: (v: boolean) =>
             setChecked(_.pickBy({ ...checked, [child.id]: v }, _.identity)),
         onBuildContextMenu: () => onBuildContextMenu(details, child),
+        inPublicSharing,
       };
       return (
           isMobile ? (
@@ -345,7 +346,7 @@ export default memo(
                     </div>
                   </div>
                 ) : (
-                  <HeaderPath path={path || []} inTrash={inTrash} setParentId={setParentId} />
+                  <HeaderPath path={path || []} inTrash={inTrash} setParentId={setParentId} inPublicSharing={inPublicSharing} />
                 )}
                 <div className="grow" />
 
@@ -390,7 +391,7 @@ export default memo(
                             onClick={() => {
                               const route = RouterServices.generateRouteFromState({dirId: child.id});
                               history.push(route);
-                              //return setParentId(child.id);
+                              if (inPublicSharing) return setParentId(child.id);
                             }}
                             checked={checked[child.id] || false}
                             onCheck={v =>
diff --git a/tdrive/frontend/src/app/views/client/body/drive/documents/common.tsx b/tdrive/frontend/src/app/views/client/body/drive/documents/common.tsx
index fc438413..9a26b9d4 100644
--- a/tdrive/frontend/src/app/views/client/body/drive/documents/common.tsx
+++ b/tdrive/frontend/src/app/views/client/body/drive/documents/common.tsx
@@ -9,6 +9,7 @@ export type DriveItemProps = {
   checked: boolean;
   onClick?: () => void;
   onBuildContextMenu: () => Promise<any[]>;
+  inPublicSharing?: boolean;
 };
 
 export type DriveItemOverlayProps = {
diff --git a/tdrive/frontend/src/app/views/client/body/drive/documents/document-row.tsx b/tdrive/frontend/src/app/views/client/body/drive/documents/document-row.tsx
index 11ecfa9a..0579afce 100644
--- a/tdrive/frontend/src/app/views/client/body/drive/documents/document-row.tsx
+++ b/tdrive/frontend/src/app/views/client/body/drive/documents/document-row.tsx
@@ -32,6 +32,7 @@ export const DocumentRow = ({
   checked,
   onClick,
   onBuildContextMenu,
+  inPublicSharing,
 }: DriveItemProps) => {
   const history = useHistory();
   const [hover, setHover] = useState(false);
@@ -59,6 +60,7 @@ export const DocumentRow = ({
 
   const preview = () => {
     history.push(RouterServices.generateRouteFromState({companyId: company, itemId: item.id}));
+    if (inPublicSharing) open(item);
   };
 
   return (
diff --git a/tdrive/frontend/src/app/views/client/body/drive/header-path.tsx b/tdrive/frontend/src/app/views/client/body/drive/header-path.tsx
index db857c77..1b0d8514 100644
--- a/tdrive/frontend/src/app/views/client/body/drive/header-path.tsx
+++ b/tdrive/frontend/src/app/views/client/body/drive/header-path.tsx
@@ -15,10 +15,12 @@ export default ({
   path: livePath,
   inTrash,
   setParentId,
+  inPublicSharing,
 }: {
   path: DriveItem[];
   inTrash?: boolean;
   setParentId: (id: string) => void;
+  inPublicSharing?: boolean;
 }) => {
   const [savedPath, setSavedPath] = useState<DriveItem[]>([]);
   const history = useHistory();
@@ -40,8 +42,7 @@ export default ({
             dirId,
           }),
         );
-        console.log("viewId changed now setting the parentId")
-        // setParentId(dirId ? dirId : viewId);
+        if (inPublicSharing) return setParentId(dirId ? dirId : viewId);
       }}
     />
   );