diff --git a/webui/src/pages/bug/BackButton.tsx b/webui/src/components/BackToListButton/BackToListButton.tsx
similarity index 92%
rename from webui/src/pages/bug/BackButton.tsx
rename to webui/src/components/BackToListButton/BackToListButton.tsx
index 4c73dd0aedafa9ce2e2bb6e854a14f3cf785a804..7ca53ad05ae8595c7790500d7322d1a0e9aa0d21 100644
--- a/webui/src/pages/bug/BackButton.tsx
+++ b/webui/src/components/BackToListButton/BackToListButton.tsx
@@ -17,7 +17,7 @@ const useStyles = makeStyles((theme) => ({
   },
 }));
 
-function BackButton() {
+function BackToListButton() {
   const classes = useStyles();
 
   return (
@@ -33,4 +33,4 @@ function BackButton() {
   );
 }
 
-export default BackButton;
+export default BackToListButton;
diff --git a/webui/src/pages/bug/Bug.tsx b/webui/src/pages/bug/Bug.tsx
index aa6247f2f5594cb872fe00177be9634270d6797f..9ce2f6a67cb11720f1a5c62c558a02b6487a9a82 100644
--- a/webui/src/pages/bug/Bug.tsx
+++ b/webui/src/pages/bug/Bug.tsx
@@ -2,11 +2,11 @@ import React from 'react';
 
 import { makeStyles } from '@material-ui/core/styles';
 
+import BackToListButton from '../../components/BackToListButton/BackToListButton';
 import BugTitleForm from 'src/components/BugTitleForm/BugTitleForm';
 import IfLoggedIn from 'src/components/IfLoggedIn/IfLoggedIn';
 import Label from 'src/components/Label';
 
-import BackButton from './BackButton';
 import { BugFragment } from './Bug.generated';
 import CommentForm from './CommentForm';
 import TimelineQuery from './TimelineQuery';
@@ -88,7 +88,7 @@ function Bug({ bug }: Props) {
       </div>
       <div className={classes.container}>
         <div className={classes.leftSidebar}>
-          <BackButton />
+          <BackToListButton />
         </div>
         <div className={classes.timeline}>
           <TimelineQuery id={bug.id} />
diff --git a/webui/src/pages/new/NewBugPage.tsx b/webui/src/pages/new/NewBugPage.tsx
index d04e753a2585bd20abdcb2f9f3819fa402f85054..aa220e04199493179c130a25a4ebebaba5b7faf0 100644
--- a/webui/src/pages/new/NewBugPage.tsx
+++ b/webui/src/pages/new/NewBugPage.tsx
@@ -4,9 +4,9 @@ import { useHistory } from 'react-router-dom';
 import { Button, Paper } from '@material-ui/core';
 import { makeStyles, Theme } from '@material-ui/core/styles';
 
+import BackToListButton from '../../components/BackToListButton/BackToListButton';
 import BugTitleInput from '../../components/BugTitleForm/BugTitleInput';
 import CommentInput from '../../components/CommentInput/CommentInput';
-import BackButton from '../bug/BackButton';
 
 import { useNewBugMutation } from './NewBug.generated';
 
@@ -96,7 +96,7 @@ function NewBugPage() {
     <main className={classes.main}>
       <div className={classes.container}>
         <div className={classes.leftSidebar}>
-          <BackButton />
+          <BackToListButton />
         </div>
         <Paper className={classes.timeline}>
           <form className={classes.form} onSubmit={submitNewIssue}>