diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7cf3bcb478..fd5cdeea05 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -23,9 +23,11 @@
 🔧 Fixes:
 
 - Update details behaviour to remove margin-bottom for all elements
-
   ([PR #900](https://github.com/alphagov/govuk-frontend/pull/900))
 
+- Update internal padding of tab content in the tabs component
+  ([PR #886](https://github.com/alphagov/govuk-frontend/pull/886))
+
 ## 1.1.0 (feature release)
 
 🆕 New features:
diff --git a/src/components/tabs/_tabs.scss b/src/components/tabs/_tabs.scss
index c97bb9fb07..9d8d9de7c1 100644
--- a/src/components/tabs/_tabs.scss
+++ b/src/components/tabs/_tabs.scss
@@ -21,7 +21,7 @@
     padding: 0;
     list-style: none;
     @include mq($until: tablet) {
-      @include govuk-responsive-margin(2, "bottom");
+      @include govuk-responsive-margin(6, "bottom");
     }
   }
 
@@ -50,6 +50,10 @@
     }
   }
 
+  .govuk-tabs__panel {
+    @include govuk-responsive-margin(8, "bottom");
+  }
+
   // JavaScript enabled
   .js-enabled {
 
@@ -104,12 +108,17 @@
       }
 
       .govuk-tabs__panel {
+        @include govuk-responsive-margin(0, "bottom");
         padding-top: govuk-spacing(6);
         padding-right: govuk-spacing(4);
-        padding-bottom: govuk-spacing(2);
+        padding-bottom: govuk-spacing(6);
         padding-left: govuk-spacing(4);
         border: 1px solid $govuk-border-colour;
         border-top: 0;
+
+        & > :last-child {
+          margin-bottom: 0;
+        }
       }
     }