diff --git a/plugins/pagerduty/src/components/ChangeEvents/ChangeEventListItem.tsx b/plugins/pagerduty/src/components/ChangeEvents/ChangeEventListItem.tsx
index a8286ace9b..76c2bde018 100644
--- a/plugins/pagerduty/src/components/ChangeEvents/ChangeEventListItem.tsx
+++ b/plugins/pagerduty/src/components/ChangeEvents/ChangeEventListItem.tsx
@@ -28,6 +28,7 @@ import { DateTime, Duration } from 'luxon';
 import { ChangeEvent } from '../types';
 import OpenInBrowserIcon from '@material-ui/icons/OpenInBrowser';
 import { BackstageTheme } from '@backstage/theme';
+import { Link } from '@backstage/core-components';
 
 const useStyles = makeStyles<BackstageTheme>({
   denseListIcon: {
@@ -59,9 +60,8 @@ export const ChangeEventListItem = ({ changeEvent }: Props) => {
     externalLinkElem = (
       <Tooltip title={text} placement="top">
         <IconButton
-          href={changeEvent.links[0].href}
-          target="_blank"
-          rel="noopener noreferrer"
+          component={Link}
+          to={changeEvent.links[0].href}
           color="primary"
         >
           <OpenInBrowserIcon />
@@ -88,9 +88,8 @@ export const ChangeEventListItem = ({ changeEvent }: Props) => {
         {externalLinkElem}
         <Tooltip title="View in Pagerduty" placement="top">
           <IconButton
-            href={changeEvent.html_url}
-            target="_blank"
-            rel="noopener noreferrer"
+            component={Link}
+            to={changeEvent.html_url}
             color="primary"
           >
             <OpenInBrowserIcon />
diff --git a/plugins/pagerduty/src/components/types.ts b/plugins/pagerduty/src/components/types.ts
index 70767890ea..d0d05d82d1 100644
--- a/plugins/pagerduty/src/components/types.ts
+++ b/plugins/pagerduty/src/components/types.ts
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 Spotify AB
+ * Copyright 2020 The Backstage Authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.