diff --git a/assets/js/src/public.jsx b/assets/js/src/public.jsx
index 8920ece6a3..69278c6b32 100644
--- a/assets/js/src/public.jsx
+++ b/assets/js/src/public.jsx
@@ -50,9 +50,17 @@ jQuery(($) => {
     const originalFontFamily = formDiv.css('font-family');
     const newFontFamily = `"${fontName}", ${originalFontFamily}`;
     formDiv.css('font-family', newFontFamily);
-    formDiv.find('option').css('font-family', 'inherit');
+    formDiv.find('input, option').css('font-family', 'inherit');
     formDiv.find('input[type=text], textarea, input[type=email], select').css('font-family', newFontFamily);
     formDiv.find(':header').css('font-family', 'inherit');
+
+    formDiv.find('input[data-font-family]').each(function applyFontFamilyToInput() {
+      const element = $(this);
+      const inputFontFamily = element.data('font-family');
+      const inputOriginalFontFamily = element.css('font-family');
+      const inputNewFontFamily = `"${inputFontFamily}", ${inputOriginalFontFamily}`;
+      element.css('font-family', inputNewFontFamily);
+    });
   }
 
   function showForm(formDiv, showOverlay = false) {
diff --git a/lib/Form/Block/Submit.php b/lib/Form/Block/Submit.php
index da30b7e2f8..7d39f75e56 100644
--- a/lib/Form/Block/Submit.php
+++ b/lib/Form/Block/Submit.php
@@ -31,6 +31,10 @@ class Submit {
 
     $html .= 'data-automation-id="subscribe-submit-button" ';
 
+    if (isset($block['styles']['font_family'])) {
+      $html .= "data-font-family='{$block['styles']['font_family']}' " ;
+    }
+
     $styles = $this->stylesRenderer->renderForButton($block['styles'] ?? [], $formSettings);
 
     if ($styles) {