diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 19bf7f3cf..72caab577 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -31,6 +31,7 @@ Changelog
  * Fix: Null characters in URLs no longer crash the redirect middleware on PostgreSQL (Andrew Crewdson, Matt Westcott)
  * Fix: Permission checks no longer prevent a non-live page from being unscheduled (Abdulmalik Abdulwahab)
  * Fix: Copy-paste between Draftail editors now preserves all formatting/content (Thibaud Colas)
+ * Fix: Fix alignment of checkboxes and radio buttons on Firefox (Matt Westcott)
 
 
 2.1.1 (04.07.2018)
diff --git a/docs/releases/2.2.rst b/docs/releases/2.2.rst
index bd11b7e16..ffec25240 100644
--- a/docs/releases/2.2.rst
+++ b/docs/releases/2.2.rst
@@ -44,6 +44,7 @@ Bug fixes
  * Null characters in URLs no longer crash the redirect middleware on PostgreSQL (Andrew Crewdson, Matt Westcott)
  * Permission checks no longer prevent a non-live page from being unscheduled (Abdulmalik Abdulwahab)
  * Copy-paste between Draftail editors now preserves all formatting/content (Thibaud Colas)
+ * Fix alignment of checkboxes and radio buttons on Firefox (Matt Westcott)
 
 Upgrade considerations
 ======================
diff --git a/wagtail/admin/static_src/wagtailadmin/scss/components/_forms.scss b/wagtail/admin/static_src/wagtailadmin/scss/components/_forms.scss
index 4c49a3a77..6f0346eb6 100644
--- a/wagtail/admin/static_src/wagtailadmin/scss/components/_forms.scss
+++ b/wagtail/admin/static_src/wagtailadmin/scss/components/_forms.scss
@@ -140,11 +140,10 @@ input[type=checkbox] {
 }
 
 input[type=radio] {
-    // stylelint-disable-next-line property-no-vendor-prefix
-    -webkit-appearance: radio;
+    height: 12px;
     width: auto;
     position: relative;
-    margin-right: 15px;
+    margin-right: 27px;
 }
 
 input[type=radio]:before {
@@ -173,11 +172,10 @@ input[type=radio]:checked:before {
 }
 
 input[type=checkbox] {
-    // stylelint-disable-next-line property-no-vendor-prefix
-    -webkit-appearance: checkbox;
+    height: 12px;
     width: auto;
     position: relative;
-    margin-right: 15px;
+    margin-right: 27px;
 }
 
 input[type=checkbox]:before {