diff --git a/lib/Form/BlockStylesRenderer.php b/lib/Form/BlockStylesRenderer.php
index 78fb2e2900..6299edb3d8 100644
--- a/lib/Form/BlockStylesRenderer.php
+++ b/lib/Form/BlockStylesRenderer.php
@@ -29,6 +29,12 @@ class BlockStylesRenderer {
     if (isset($formSettings['alignment'])) {
       $rules[] = $this->convertAlignmentToMargin($formSettings['alignment']);
     }
+    if (isset($styles['font_size'])) {
+      $rules[] = "font-size:" . intval($styles['font_size']) . "px;";
+    }
+    if (isset($formSettings['fontSize']) && !isset($styles['font_size'])) {
+      $rules[] = "font-size:" . intval($formSettings['fontSize']) . "px;";
+    }
     return implode('', $rules);
   }
 
@@ -37,9 +43,6 @@ class BlockStylesRenderer {
     if (isset($styles['font_color'])) {
       $rules[] = "color:{$styles['font_color']};";
     }
-    if (isset($styles['font_size'])) {
-      $rules[] = "font-size:" . intval($styles['font_size']) . "px;";
-    }
     if (!isset($styles['border_color'])) {
       $rules[] = "border-color:transparent;";
     }
diff --git a/tests/unit/Form/BlockStylesRendererTest.php b/tests/unit/Form/BlockStylesRendererTest.php
index 464b0bf4af..efe40b868b 100644
--- a/tests/unit/Form/BlockStylesRendererTest.php
+++ b/tests/unit/Form/BlockStylesRendererTest.php
@@ -37,6 +37,7 @@ class BlockStylesRendererTest extends \MailPoetUnitTest {
     ];
     $settings = [
       'input_padding' => '40',
+      'fontSize' => 13,
     ];
     $result = $this->renderer->renderForTextInput($styles, $settings);
     expect($result)->contains('border-radius:10px;');
@@ -44,6 +45,7 @@ class BlockStylesRendererTest extends \MailPoetUnitTest {
     expect($result)->contains('border-width:10px;');
     expect($result)->contains('background-color:#dddddd;');
     expect($result)->contains('padding:40px;');
+    expect($result)->contains('font-size:13px;');
     expect($result)->notContains('font-weight:bold;');
   }
 
@@ -68,6 +70,7 @@ class BlockStylesRendererTest extends \MailPoetUnitTest {
     ];
     $settings = [
       'input_padding' => '40',
+      'fontSize' => 13,
     ];
     $result = $this->renderer->renderForButton($styles, $settings);
     expect($result)->contains('border-radius:10px;');