diff --git a/src/sentry/static/sentry/app/views/organizationEventsV2/data.jsx b/src/sentry/static/sentry/app/views/organizationEventsV2/data.jsx
index bd93839994ec84..a85d73fa77fb05 100644
--- a/src/sentry/static/sentry/app/views/organizationEventsV2/data.jsx
+++ b/src/sentry/static/sentry/app/views/organizationEventsV2/data.jsx
@@ -10,7 +10,7 @@ import ProjectBadge from 'app/components/idBadge/projectBadge';
 import UserBadge from 'app/components/idBadge/userBadge';
 import DateTime from 'app/components/dateTime';
 
-import {QueryLink} from './styles';
+import {QueryButton} from './styles';
 
 export const ALL_VIEWS = deepFreeze([
   {
@@ -82,9 +82,9 @@ export const SPECIAL_FIELDS = {
   type: {
     fields: ['event.type'],
     renderFunc: (data, {onSearch}) => (
-      <QueryLink onClick={() => onSearch(`event.type:${data['event.type']}`)}>
+      <QueryButton onClick={() => onSearch(`event.type:${data['event.type']}`)}>
         {data['event.type']}
-      </QueryLink>
+      </QueryButton>
     ),
   },
   project: {
@@ -117,7 +117,9 @@ export const SPECIAL_FIELDS = {
         return <Container>{badge}</Container>;
       }
 
-      return <QueryLink onClick={() => onSearch(`user:${data.user}`)}>{badge}</QueryLink>;
+      return (
+        <QueryButton onClick={() => onSearch(`user:${data.user}`)}>{badge}</QueryButton>
+      );
     },
   },
   time: {
diff --git a/src/sentry/static/sentry/app/views/organizationEventsV2/styles.jsx b/src/sentry/static/sentry/app/views/organizationEventsV2/styles.jsx
index 34871107ea45cf..6b8aa6e7b60c80 100644
--- a/src/sentry/static/sentry/app/views/organizationEventsV2/styles.jsx
+++ b/src/sentry/static/sentry/app/views/organizationEventsV2/styles.jsx
@@ -1,8 +1,12 @@
+import React from 'react';
 import styled from 'react-emotion';
 import space from 'app/styles/space';
+import Button from 'app/components/button';
 import overflowEllipsis from 'app/styles/overflowEllipsis';
 
-export const QueryLink = styled('a')`
+export const QueryButton = styled(props => (
+  <Button size="zero" borderless={true} {...props} />
+))`
   ${overflowEllipsis};
   color: ${p => p.theme.foreground};
   padding: ${space(1)};
diff --git a/src/sentry/static/sentry/app/views/organizationEventsV2/table.jsx b/src/sentry/static/sentry/app/views/organizationEventsV2/table.jsx
index d508526bc47fa4..25f85cbe544b50 100644
--- a/src/sentry/static/sentry/app/views/organizationEventsV2/table.jsx
+++ b/src/sentry/static/sentry/app/views/organizationEventsV2/table.jsx
@@ -10,7 +10,7 @@ import {t} from 'app/locale';
 import space from 'app/styles/space';
 
 import {SPECIAL_FIELDS} from './data';
-import {QueryLink} from './styles';
+import {QueryButton} from './styles';
 
 export default class Table extends React.Component {
   static propTypes = {
@@ -45,9 +45,9 @@ export default class Table extends React.Component {
             {SPECIAL_FIELDS.hasOwnProperty(field) ? (
               SPECIAL_FIELDS[field].renderFunc(row, {organization, onSearch, location})
             ) : (
-              <QueryLink onClick={() => onSearch(`${field}:${row[field]}`)}>
+              <QueryButton onClick={() => onSearch(`${field}:${row[field]}`)}>
                 {row[field]}
-              </QueryLink>
+              </QueryButton>
             )}
           </Cell>
         ))}