diff --git a/lib/Form/Block/Columns.php b/lib/Form/Block/Columns.php
index a2ab88667a..3216bc4246 100644
--- a/lib/Form/Block/Columns.php
+++ b/lib/Form/Block/Columns.php
@@ -29,6 +29,8 @@ class Columns {
     if (!empty($params['background_color'])) {
       $classes[] = "has-{$params['background_color']}-background-color";
       $classes[] = "mailpoet_column_has_background";
+    } elseif (!empty($params['custom_background_color'])) {
+      $classes[] = "mailpoet_column_has_background";
     }
     if (!empty($params['text_color'])) {
       $classes[] = "has-{$params['text_color']}-color";
diff --git a/tests/unit/Form/Block/ColumnsTest.php b/tests/unit/Form/Block/ColumnsTest.php
index 17bd43b56a..dfe989f0fb 100644
--- a/tests/unit/Form/Block/ColumnsTest.php
+++ b/tests/unit/Form/Block/ColumnsTest.php
@@ -71,9 +71,11 @@ class ColumnsTest extends \MailPoetUnitTest {
     $block = $this->block;
     $block['params']['custom_background_color'] = '#ffffff';
     $html = $this->columns->render($block, 'content');
-    $columns = $this->htmlParser->getElementByXpath($html, '//div[@class="mailpoet_form_columns"]');
+    $columns = $this->htmlParser->getElementByXpath($html, '//div[1]');
     $style = $this->htmlParser->getAttribute($columns, 'style');
     expect($style->textContent)->contains('background-color:#ffffff;');
+    $class = $this->htmlParser->getAttribute($columns, 'class');
+    expect($class->textContent)->contains('mailpoet_column_has_background');
   }
 
   public function testItShouldCustomTextColor() {