diff --git a/app/layout/genericlayout.cpp b/app/layout/genericlayout.cpp
index 9edd01d1c..b906fb895 100644
--- a/app/layout/genericlayout.cpp
+++ b/app/layout/genericlayout.cpp
@@ -184,7 +184,7 @@ QString GenericLayout::background() const
 
 QString GenericLayout::textColor() const
 {
-    if (backgroundStyle() == Layout::PatternBackgroundStyle && customBackground().isEmpty()) {
+    if (backgroundStyle() == Layout::PatternBackgroundStyle && customBackground().isEmpty() && customTextColor().isEmpty()) {
         return AbstractLayout::defaultCustomTextColor();
     }
 
diff --git a/app/settings/detailsdialog/detailshandler.cpp b/app/settings/detailsdialog/detailshandler.cpp
index 8022db767..335f8a372 100644
--- a/app/settings/detailsdialog/detailshandler.cpp
+++ b/app/settings/detailsdialog/detailshandler.cpp
@@ -180,9 +180,13 @@ void DetailsHandler::loadLayout(const Latte::Data::Layout &data)
 
     if (data.background.isEmpty()) {
         m_ui->backPatternWidget->setBackground(m_colorsModel->colorPath(Latte::Layout::AbstractLayout::defaultCustomBackground()));
-        m_ui->backPatternWidget->setTextColor(Latte::Layout::AbstractLayout::defaultCustomTextColor());
     } else {
         m_ui->backPatternWidget->setBackground(data.background);
+    }
+
+    if (data.background.isEmpty() && data.textColor.isEmpty()) {
+        m_ui->backPatternWidget->setTextColor(Latte::Layout::AbstractLayout::defaultCustomTextColor());
+    } else {
         m_ui->backPatternWidget->setTextColor(data.textColor);
     }