diff --git a/mailpoet/lib/EmailEditor/Engine/SettingsController.php b/mailpoet/lib/EmailEditor/Engine/SettingsController.php
index a92b713595..5a7cd86e0e 100644
--- a/mailpoet/lib/EmailEditor/Engine/SettingsController.php
+++ b/mailpoet/lib/EmailEditor/Engine/SettingsController.php
@@ -73,13 +73,6 @@ class SettingsController {
     $settings['styles'] = apply_filters('mailpoet_email_editor_editor_styles', $settings['styles']);
 
     $settings['__experimentalFeatures'] = $themeSettings;
-    // Enable border radius, color, style and width where possible
-    $settings['__experimentalFeatures']['border'] = [
-      "radius" => true,
-      "color" => true,
-      "style" => true,
-      "width" => true,
-    ];
 
     // Enabling alignWide allows full width for specific blocks such as columns, heading, image, etc.
     $settings['alignWide'] = true;
diff --git a/mailpoet/lib/EmailEditor/Engine/theme.json b/mailpoet/lib/EmailEditor/Engine/theme.json
index 60010a4eed..33b59e538a 100644
--- a/mailpoet/lib/EmailEditor/Engine/theme.json
+++ b/mailpoet/lib/EmailEditor/Engine/theme.json
@@ -10,6 +10,12 @@
       "padding": true,
       "margin": false
     },
+    "border": {
+      "radius": true,
+      "color": true,
+      "style": true,
+      "width": true
+    },
     "typography": {
       "dropCap": false,
       "fontWeight": false,