diff --git a/frontend/src/component/addons/AddonForm/AddonForm.jsx b/frontend/src/component/addons/AddonForm/AddonForm.jsx
index d47e76c6d1..889d20c51f 100644
--- a/frontend/src/component/addons/AddonForm/AddonForm.jsx
+++ b/frontend/src/component/addons/AddonForm/AddonForm.jsx
@@ -1,7 +1,7 @@
-import React, { useState, useEffect } from 'react';
+import { useState, useEffect } from 'react';
 import PropTypes from 'prop-types';
-import { TextField, FormControlLabel, Switch } from '@material-ui/core';
-import { FormButtons, styles as commonStyles } from '../../common';
+import { TextField, FormControlLabel, Switch, Button } from '@material-ui/core';
+import { styles as commonStyles } from '../../common';
 import { trim } from '../../common/util';
 import { AddonParameters } from './AddonParameters/AddonParameters';
 import { AddonEvents } from './AddonEvents/AddonEvents';
@@ -79,7 +79,7 @@ export const AddonForm = ({ editMode, provider, addon, fetch }) => {
         setErrors({ ...errors, events: undefined });
     };
 
-    const handleCancel = () => {
+    const onCancel = () => {
         history.goBack();
     };
 
@@ -203,10 +203,12 @@ export const AddonForm = ({ editMode, provider, addon, fetch }) => {
                     />
                 </section>
                 <section className={styles.formSection}>
-                    <FormButtons
-                        submitText={submitText}
-                        onCancel={handleCancel}
-                    />
+                    <Button type="submit" color="primary" variant="contained">
+                        {submitText}
+                    </Button>
+                    <Button type="button" onClick={onCancel}>
+                        Cancel
+                    </Button>
                 </section>
             </form>
         </PageContent>