diff --git a/src/components/Dashboard/DashboardDocumentList/DashboardDocumentList.js b/src/components/Dashboard/DashboardDocumentList/DashboardDocumentList.js
index 71748ce9..22648376 100644
--- a/src/components/Dashboard/DashboardDocumentList/DashboardDocumentList.js
+++ b/src/components/Dashboard/DashboardDocumentList/DashboardDocumentList.js
@@ -2,12 +2,13 @@
 import React, { useState, useEffect } from 'react';
 import Link from 'next/link';
 import {
-  Badge, Button, Card, Col, ListGroup, Row, Tab, Tabs,
+  Badge, Button, Card, Col, ListGroup, OverlayTrigger, Row, Tab, Tabs, Tooltip,
 } from 'react-bootstrap';
+import { Plus } from 'react-bootstrap-icons';
 import { format } from 'date-fns';
 import LoadingSpinner from '../../LoadingSpinner';
 import { getSharedDocumentsByGroup, getDocumentsByUser } from '../../../utils/docUtil';
-import { getGroupNameById } from '../../../utils/groupUtil';
+import { getGroupNameById, filterGroupIdsByUser } from '../../../utils/groupUtil';
 
 const DashboardDocumentList = ({
   session,
@@ -70,73 +71,109 @@ const DashboardDocumentList = ({
   }, [documents, documentGroupState]);
 
   return (
-    <Card data-testid="dash-document-list">
-      <Card.Header>
-        <Card.Title><Link href="/documents">Documents</Link></Card.Title>
-        <Tabs
-          transition={false}
-          style={{ justifyContent: 'flex-end', float: 'right', marginTop: '-2rem' }}
-          activeKey={key}
-          onSelect={(k) => {
-            setKey(k);
-          }}
-        >
-          <Tab eventKey="shared" title="Shared" />
-          <Tab eventKey="mine" title="Mine" />
-        </Tabs>
-      </Card.Header>
-      {listLoading && (
-        <LoadingSpinner />
-      )}
-      {!listLoading && documents && documents.length > 0 && (
-      <ListGroup>
-        {documents.sort((a, b) => new Date(b.createdAt) - new Date(a.createdAt)).map(
-          (document) => (
-            <ListGroup.Item key={document.slug}>
-              <Row>
-                <Col>
-                  <Link href={`/documents/${document.slug}`}>{document.title}</Link>
-                </Col>
-                <Col className="text-right">
-                  {document.groups && document.groups.length > 0 && (
-                  <Badge
-                    variant="info"
-                    key={document.groups.sort()[0]}
-                    className="mr-2"
-                  >
-                    {documentGroupState[document.groups.sort()[0]]}
-                  </Badge>
-                  )}
-                  <>
-                    {format(new Date(document.createdAt), 'MM/dd/yyyy')}
-                  </>
-                </Col>
-              </Row>
-            </ListGroup.Item>
-          ),
+    <>
+      <Card data-testid="dash-document-list">
+        <Card.Header>
+          <Card.Title><Link href="/documents">Documents</Link></Card.Title>
+          <Tabs
+            transition={false}
+            style={{ justifyContent: 'flex-end', float: 'right', marginTop: '-2rem' }}
+            activeKey={key}
+            onSelect={(k) => {
+              setKey(k);
+            }}
+          >
+            <Tab eventKey="shared" title="Shared" />
+            <Tab eventKey="mine" title="Mine" />
+          </Tabs>
+        </Card.Header>
+        {listLoading && (
+          <LoadingSpinner />
         )}
-        <ListGroup.Item style={{ fontWeight: 'bold' }} key="all-docs">
-          <Link href={`/documents?tab=${key}`}>
-            {`See all ${key === 'shared' ? key : 'created'} documents...`}
-          </Link>
-        </ListGroup.Item>
-      </ListGroup>
-      )}
-      {!listLoading && documents && documents.length === 0 && (
-        <Card.Body>
-          {`You have no ${key === 'shared' ? key : 'created'} documents.`}
-        </Card.Body>
-      )}
-      <Card.Footer className="text-right" style={{ borderTop: 0 }}>
-        <Button
-          size="sm"
-          variant="outline-primary"
-          href="/documents/new"
-        >
-          + Create new document
-        </Button>
-      </Card.Footer>
-    </Card>
+        {!listLoading && documents && documents.length > 0 && (
+        <ListGroup>
+          {documents.sort((a, b) => new Date(b.createdAt) - new Date(a.createdAt)).map(
+            (document) => (
+              <ListGroup.Item key={document.slug}>
+                <Row>
+                  <Col>
+                    <Link href={`/documents/${document.slug}`}>{document.title}</Link>
+                  </Col>
+                  <Col className="text-right">
+                    {session && session.user.groups && document.groups
+                    && filterGroupIdsByUser(document.groups, session.user.groups).length > 0 && (
+                    <Badge
+                      variant="info"
+                      key={filterGroupIdsByUser(document.groups, session.user.groups).sort()[0]}
+                      className="mr-2"
+                    >
+                      {documentGroupState[filterGroupIdsByUser(document.groups, session.user.groups)
+                        .sort()[0]]}
+                    </Badge>
+                    )}
+                    {document.groups && session && session.user.groups
+                    && filterGroupIdsByUser(document.groups, session.user.groups).length > 1 && (
+                      <OverlayTrigger
+                        overlay={(
+                          <Tooltip id="tooltip-groups">
+                            Shared with additional groups
+                          </Tooltip>
+                        )}
+                        placement="top"
+                      >
+                        <Plus
+                          className="mr-1 ml-n1 mb-1"
+                          title="Tooltip on left"
+                        />
+                      </OverlayTrigger>
+                    )}
+                    <>
+                      {format(new Date(document.createdAt), 'MM/dd/yyyy')}
+                    </>
+                  </Col>
+                </Row>
+              </ListGroup.Item>
+            ),
+          )}
+          <ListGroup.Item style={{ fontWeight: 'bold' }} key="all-docs">
+            <Link href={`/documents?tab=${key}`}>
+              {`See all ${key === 'shared' ? key : 'created'} documents...`}
+            </Link>
+          </ListGroup.Item>
+        </ListGroup>
+        )}
+        {!listLoading && documents && documents.length === 0 && (
+          <Card.Body>
+            {`You have no ${key === 'shared' ? key : 'created'} documents.`}
+          </Card.Body>
+        )}
+        <Card.Footer className="text-right" style={{ borderTop: 0 }}>
+          <Button
+            size="sm"
+            variant="outline-primary"
+            href="/documents/new"
+          >
+            + Create new document
+          </Button>
+        </Card.Footer>
+      </Card>
+      <style jsx global>
+        {`
+          #tooltip-groups .tooltip-inner {
+            font-size: 12px;
+            background-color: #f6f6f6;
+            color: black;
+            border: 1px solid rgba(0, 0, 0, 0.125);
+          }
+          #tooltip-groups .arrow {
+            background-color: transparent;
+          }
+          #tooltip-groups .arrow::before {
+            border-top-color: rgba(0, 0, 0, 0.125);
+          }
+        `}
+      </style>
+    </>
   );
 };
 
diff --git a/src/components/DocumentList/DocumentList.js b/src/components/DocumentList/DocumentList.js
index 3745c46f..86fdefe0 100644
--- a/src/components/DocumentList/DocumentList.js
+++ b/src/components/DocumentList/DocumentList.js
@@ -14,7 +14,7 @@ import {
 } from 'react-bootstrap-icons';
 import { format } from 'date-fns';
 import LoadingSpinner from '../LoadingSpinner';
-import { getGroupNameById } from '../../utils/groupUtil';
+import { getGroupNameById, filterGroupIdsByUser } from '../../utils/groupUtil';
 import { deleteDocumentById } from '../../utils/docUtil';
 import ConfirmationDialog from '../ConfirmationDialog';
 import { ucFirst } from '../../utils/stringUtil';
@@ -27,6 +27,7 @@ const DocumentList = ({
   userId,
   alerts,
   setAlerts,
+  userGroups,
 }) => {
   const [groupState, setGroupState] = useState({});
   const [showModal, setShowModal] = useState('');
@@ -114,8 +115,8 @@ const DocumentList = ({
                     {format(new Date(document.createdAt), 'MM/dd/yyyy')}
                   </td>
                   <td>
-                    {(document.groups && document.groups.length > 0)
-                      ? document.groups.sort().map((group) => (
+                    {(document.groups && document.groups.length > 0 && userGroups)
+                      ? filterGroupIdsByUser(document.groups, userGroups).sort().map((group) => (
                         <Badge
                           variant="info"
                           className="mr-1"
diff --git a/src/pages/documents/index.jsx b/src/pages/documents/index.jsx
index 182e3b2d..10c5e07c 100644
--- a/src/pages/documents/index.jsx
+++ b/src/pages/documents/index.jsx
@@ -97,6 +97,7 @@ const DocumentsIndex = ({
               setAlerts={setAlerts}
               loading={listLoading}
               setLoading={setListLoading}
+              userGroups={session.user.groups}
               userId={session.user.id}
             />
           )}
diff --git a/src/utils/groupUtil.js b/src/utils/groupUtil.js
index 133e577a..f93b9bcf 100644
--- a/src/utils/groupUtil.js
+++ b/src/utils/groupUtil.js
@@ -358,6 +358,14 @@ const getGroupById = async (id) => {
     return Promise.resolve(res.json());
   } return Promise.reject(Error(`Unable to get group ${id}: error ${res.status} received from server`));
 };
+
+const filterGroupIdsByUser = (groupIds, userGroups) => {
+  if (userGroups) {
+    const filtered = userGroups.filter((grp) => groupIds.includes(grp.id));
+    return filtered.map((grp) => grp.id);
+  } return [];
+};
+
 export {
   addGroupToUser,
   addUserToGroup,
@@ -365,6 +373,7 @@ export {
   deleteGroup,
   deleteGroupById,
   deleteInviteToken,
+  filterGroupIdsByUser,
   generateInviteToken,
   getGroupById,
   getGroupNameById,