diff --git a/app/javascript/vue/forms/renderers/name.vue b/app/javascript/vue/forms/renderers/name.vue
index ac969e84f..0af6736df 100644
--- a/app/javascript/vue/forms/renderers/name.vue
+++ b/app/javascript/vue/forms/renderers/name.vue
@@ -1,7 +1,12 @@
 <template>
-  <a :href="params.data.urls.show" :title="params.data.name">
+  <a v-if="params.data.urls.show"
+      :href="params.data.urls.show"
+      :title="params.data.name">
     {{ params.data.name }}
   </a>
+  <span v-else class="text-sn-grey" :title="params.data.name">
+    {{ params.data.name }}
+  </span>
 </template>
 
 <script>
diff --git a/app/models/form.rb b/app/models/form.rb
index fca325a28..70acc38bd 100644
--- a/app/models/form.rb
+++ b/app/models/form.rb
@@ -36,6 +36,20 @@ class Form < ApplicationRecord
 
   enum :visibility, { hidden: 0, visible: 1 }
 
+  def self.viewable_by_user(user, teams)
+    # Team owners see all forms in the team
+    owner_role = UserRole.find_predefined_owner_role
+    forms = Form.where(team: teams)
+    viewable_as_team_owner = forms.joins("INNER JOIN user_assignments team_user_assignments " \
+                                         "ON team_user_assignments.assignable_type = 'Team' " \
+                                         "AND team_user_assignments.assignable_id = forms.team_id")
+                                  .where(team_user_assignments: { user_id: user, user_role_id: owner_role })
+                                  .select(:id)
+    viewable_as_assigned = forms.with_granted_permissions(user, FormPermissions::READ).select(:id)
+
+    where('forms.id IN ((?) UNION (?))', viewable_as_team_owner, viewable_as_assigned)
+  end
+
   def archived_branch?
     archived?
   end
diff --git a/app/serializers/lists/form_serializer.rb b/app/serializers/lists/form_serializer.rb
index 933a96488..73d6c5e3b 100644
--- a/app/serializers/lists/form_serializer.rb
+++ b/app/serializers/lists/form_serializer.rb
@@ -57,10 +57,11 @@ module Lists
 
     def urls
       urls_list = {
-        show: form_path(object),
         show_access: access_permissions_form_path(object)
       }
 
+      urls_list[:show] = form_path(object) if can_read_form?(object)
+
       if can_manage_form_users?(object)
         urls_list[:update_access] = access_permissions_form_path(object)
         urls_list[:new_access] = new_access_permissions_form_path(id: object.id)
diff --git a/app/services/lists/forms_service.rb b/app/services/lists/forms_service.rb
index 5e54df6f5..59b4d32a8 100644
--- a/app/services/lists/forms_service.rb
+++ b/app/services/lists/forms_service.rb
@@ -10,8 +10,9 @@ module Lists
     def fetch_records
       @records =
         Form.includes(:team, user_assignments: %i(user user_role))
-            .joins(:user_assignments)
+            .left_outer_joins(:user_assignments)
             .left_outer_joins(:form_responses)
+            .viewable_by_user(@user, @team)
             .joins(
               'LEFT OUTER JOIN users AS publishers ' \
               'ON forms.published_by_id = publishers.id'
@@ -20,7 +21,7 @@ module Lists
               'publishers.full_name AS published_by_user',
               'COUNT(DISTINCT form_responses.id) AS used_in_protocols_count',
               'COUNT(DISTINCT user_assignments.id) AS user_assignment_count'
-            ).where(team: @team).readable_by_user(@user).group('forms.id', 'publishers.full_name')
+            ).where(team: @team).group('forms.id', 'publishers.full_name')
 
       view_mode = @params[:view_mode] || 'active'