diff --git a/backend/src/app/rpc/commands/viewer.clj b/backend/src/app/rpc/commands/viewer.clj
index c2887ef96..70d5193c1 100644
--- a/backend/src/app/rpc/commands/viewer.clj
+++ b/backend/src/app/rpc/commands/viewer.clj
@@ -38,6 +38,11 @@
         team    (-> (db/get conn :team {:id (:team-id project)})
                     (teams/decode-row))
 
+        members (into #{} (->> (teams/get-team-members conn (:team-id project))
+                               (map :id)))
+
+        perms   (assoc perms :in-team (contains? members profile-id))
+
         _       (-> (cfeat/get-team-enabled-features cf/flags team)
                     (cfeat/check-client-features! (:features params))
                     (cfeat/check-file-features! (:features file)))
diff --git a/frontend/src/app/main/ui/components/tab_container.cljs b/frontend/src/app/main/ui/components/tab_container.cljs
index bd3ff6727..20c79a417 100644
--- a/frontend/src/app/main/ui/components/tab_container.cljs
+++ b/frontend/src/app/main/ui/components/tab_container.cljs
@@ -54,9 +54,10 @@
          (let [props (.-props tab)
                id    (.-id props)
                title (.-title props)
-               sid   (d/name id)]
+               sid   (d/name id)
+               tooltip (if (string? title) title nil)]
            [:div {:key (str/concat "tab-" sid)
-                  :title title
+                  :title tooltip
                   :data-id sid
                   :on-click on-click
                   :class  (stl/css-case
diff --git a/frontend/src/app/main/ui/viewer/header.cljs b/frontend/src/app/main/ui/viewer/header.cljs
index 6e3051cf7..77460f0b6 100644
--- a/frontend/src/app/main/ui/viewer/header.cljs
+++ b/frontend/src/app/main/ui/viewer/header.cljs
@@ -180,7 +180,7 @@
        :on-zoom-fit  handle-zoom-fit
        :on-fullscreen toggle-fullscreen}]
 
-     (when (:can-edit permissions)
+     (when (:in-team permissions)
        [:span {:on-click go-to-workspace
                :class (stl/css :edit-btn)}
         i/curve])
@@ -191,7 +191,9 @@
              :on-click toggle-fullscreen}
       i/expand]
 
-     (when (:is-admin permissions)
+     (when (and
+            (:in-team permissions)
+            (:is-admin permissions))
        [:button {:on-click open-share-dialog
                  :class (stl/css :share-btn)}
         (tr "labels.share")])
@@ -301,8 +303,8 @@
       ;; If the user doesn't have permission we disable the link
       [:a {:class (stl/css :home-link)
            :on-click go-to-dashboard
-           :style {:cursor (when-not (:can-edit permissions) "auto")
-                   :pointer-events (when-not (:can-edit permissions) "none")}}
+           :style {:cursor (when-not (:in-team permissions) "auto")
+                   :pointer-events (when-not (:in-team permissions) "none")}}
        [:span {:class (stl/css :logo-icon)}
         i/logo-icon]]
 
@@ -321,7 +323,7 @@
                 :title (tr "viewer.header.interactions-section" (sc/get-tooltip :open-interactions))}
        i/play]
 
-      (when (or (:can-edit permissions)
+      (when (or (:in-team permissions)
                 (= (:who-comment permissions) "all"))
         [:button {:on-click navigate
                   :data-value "comments"