diff --git a/src/components/blocks/TableContent.js b/src/components/blocks/TableContent.js
index 0a2ee71..05311d3 100644
--- a/src/components/blocks/TableContent.js
+++ b/src/components/blocks/TableContent.js
@@ -310,14 +310,16 @@ const TableContent = props => {
                   {props.columns.map((c, i) => (
                     <td key={c.key}>
                       {i === 0
-                        ? <Link
-                            to={`/internal/${props.urlParam}/${a.sid}/edit`}
-                            tabIndex={modalOpen ? '-1' : ''}
-                          >
-                            <span tabIndex="-1" title={a[c.key]}>
-                              {a[c.key]}
-                            </span>
-                          </Link>
+                        ? <span>
+                            <Link
+                              to={`/internal/${props.urlParam}/${a.sid}/edit`}
+                              tabIndex={modalOpen ? '-1' : ''}
+                            >
+                              <span tabIndex="-1" title={a[c.key]}>
+                                {a[c.key]}
+                              </span>
+                            </Link>
+                          </span>
                         : <span title={a[c.key]}>{a[c.key]}</span>
                       }
                     </td>
diff --git a/src/components/elements/Table.js b/src/components/elements/Table.js
index 6728fff..6707db2 100644
--- a/src/components/elements/Table.js
+++ b/src/components/elements/Table.js
@@ -38,27 +38,29 @@ const Table = styled.table`
     padding: 0 1.5rem;
   }
 
-  & td {
+  & td > span {
     overflow: hidden;
     text-overflow: ellipsis;
     white-space: nowrap;
+    display: block;
+    padding: 0.5rem 0;
   }
 
-  & td > a {
+  & td > span > a {
     outline: 0;
     text-decoration: none;
   }
 
-  & td > a > span {
+  & td > span > a > span {
     outline: 0;
     color: #565656;
   }
 
-  & td > a:hover > span {
+  & td > span > a:hover > span {
     box-shadow: 0 0.125rem 0 #565656;
   }
 
-  & td > a:focus > span {
+  & td > span > a:focus > span {
     padding: 0.625rem;
     margin: -0.625rem;
     border-radius: 0.25rem;