diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index e62bcda3ec..c60c262612 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -19,6 +19,7 @@ Changelog
  * Show more granular error messages from Pillow when uploading images (Rick van Hattem)
  * Add ordering to `Site` object, so that index page and `Site` switcher will be sorted consistently (Coen van der Kamp, Tim Leguijt)
  * Add Reddit to oEmbed provider list (Luke Hardwick)
+ * Remove sticky footer on small devices, so that content is not blocked and more easily editable (Saeed Tahmasebi)
  * Fix: Support IPv6 domain (Alex Gleason, Coen van der Kamp)
  * Fix: Ensure link to add a new user works when no users are visible in the users list (LB (Ben Johnston))
  * Fix: `AbstractEmailForm` saved submission fields are now aligned with the email content fields, `form.cleaned_data` will be used instead of `form.fields` (Haydn Greatnews)
diff --git a/CONTRIBUTORS.rst b/CONTRIBUTORS.rst
index d254bec13a..de95221880 100644
--- a/CONTRIBUTORS.rst
+++ b/CONTRIBUTORS.rst
@@ -457,6 +457,7 @@ Contributors
 * Jonatas Baldin
 * Rick van Hattem
 * Luke Hardwick
+* Saeed Tahmasebi
 
 Translators
 ===========
diff --git a/client/scss/components/_footer.scss b/client/scss/components/_footer.scss
index 6d8ae3ea75..8ebb2da4fd 100644
--- a/client/scss/components/_footer.scss
+++ b/client/scss/components/_footer.scss
@@ -4,12 +4,8 @@ footer {
     border-radius: 3px 3px 0 0;
     box-shadow: 0 0 2px rgba(255, 255, 255, 0.5);
     background: $color-grey-1;
-    position: fixed;
-    bottom: 0;
-    padding: 0.5em;
-    width: 90%;
-    margin: 0 5%;
     color: $color-white;
+    margin-top: $mobile-nice-padding;
 
     ul {
         @include unlist();
@@ -72,5 +68,8 @@ footer {
         margin-left: $desktop-nice-padding;
         margin-right: $desktop-nice-padding;
         width: calc(100% - #{$menu-width} - #{2 * $desktop-nice-padding});
+        position: fixed;
+        bottom: 0;
+        padding: 0.5em;
     }
 }
diff --git a/client/scss/components/_grid.legacy.scss b/client/scss/components/_grid.legacy.scss
index d42c6d7acd..10eead7b84 100644
--- a/client/scss/components/_grid.legacy.scss
+++ b/client/scss/components/_grid.legacy.scss
@@ -19,8 +19,11 @@
     background: $color-white;
     border-top: 0 solid $color-grey-5; // this top border provides space for the floating logo to toggle the menu
     min-height: 100%;
-    padding-bottom: 4em;
     position: relative; // yuk. necessary for positions for jquery ui widgets
+
+    @include media-breakpoint-up(sm) {
+        padding-bottom: 4em;
+    }
 }
 
 @include media-breakpoint-up(sm) {
diff --git a/docs/releases/2.10.rst b/docs/releases/2.10.rst
index 57e9f62b91..ac020951fd 100644
--- a/docs/releases/2.10.rst
+++ b/docs/releases/2.10.rst
@@ -28,6 +28,7 @@ Other features
  * Show more granular error messages from Pillow when uploading images (Rick van Hattem)
  * Add ordering to ``Site`` object, so that index page and ``Site`` switcher will be sorted consistently (Coen van der Kamp, Tim Leguijt)
  * Add Reddit to oEmbed provider list (Luke Hardwick)
+ * Remove sticky footer on small devices, so that content is not blocked and more easily editable (Saeed Tahmasebi)
 
 
 Bug fixes