diff --git a/app/settings/generic/generictools.cpp b/app/settings/generic/generictools.cpp
index 1241b1a51..0a0e96e4c 100644
--- a/app/settings/generic/generictools.cpp
+++ b/app/settings/generic/generictools.cpp
@@ -188,7 +188,17 @@ void drawLayoutIcon(QPainter *painter, const QStyleOption &option, const QRect &
     }
 }
 
-QRect drawChangesIndicatorBackground(QPainter *painter, const QStyleOptionViewItem &option)
+QRect remainedFromChangesIndicator(const QStyleOptionViewItem &option)
+{
+    int tsize{INDICATORCHANGESLENGTH + INDICATORCHANGESMARGIN*2};
+
+    QRect optionRemainedRect = (qApp->layoutDirection() == Qt::RightToLeft) ? QRect(option.rect.x() + tsize, option.rect.y(), option.rect.width() - tsize, option.rect.height()) :
+                                                                              QRect(option.rect.x(), option.rect.y(), option.rect.width() - tsize, option.rect.height());
+
+    return optionRemainedRect;
+}
+
+void drawChangesIndicatorBackground(QPainter *painter, const QStyleOptionViewItem &option)
 {
     int tsize{INDICATORCHANGESLENGTH + INDICATORCHANGESMARGIN*2};
 
@@ -204,11 +214,6 @@ QRect drawChangesIndicatorBackground(QPainter *painter, const QStyleOptionViewIt
     }
 
     option.widget->style()->drawControl(QStyle::CE_ItemViewItem, &indicatorOption, painter);
-
-    QRect optionRemainedRect = (qApp->layoutDirection() == Qt::RightToLeft) ? QRect(option.rect.x() + tsize, option.rect.y(), option.rect.width() - tsize, option.rect.height()) :
-                                                                              QRect(option.rect.x(), option.rect.y(), option.rect.width() - tsize, option.rect.height());
-
-    return optionRemainedRect;
 }
 
 void drawChangesIndicator(QPainter *painter, const QStyleOptionViewItem &option)
diff --git a/app/settings/generic/generictools.h b/app/settings/generic/generictools.h
index 6ab7135ee..b74dce3e4 100644
--- a/app/settings/generic/generictools.h
+++ b/app/settings/generic/generictools.h
@@ -51,8 +51,10 @@ void drawFormattedText(QPainter *painter, const QStyleOptionViewItem &option);
 void drawLayoutIcon(QPainter *painter, const QStyleOption &option, const QRect &target, const Latte::Data::LayoutIcon &icon);
 
 //! changes indicator
+QRect remainedFromChangesIndicator(const QStyleOptionViewItem &option);
+void drawChangesIndicatorBackground(QPainter *painter, const QStyleOptionViewItem &option);
 void drawChangesIndicator(QPainter *painter, const QStyleOptionViewItem &option);
-QRect drawChangesIndicatorBackground(QPainter *painter, const QStyleOptionViewItem &option);
+
 
 //! screen icon
 QRect remainedFromScreenDrawing(const QStyleOptionViewItem &option);
diff --git a/app/settings/settingsdialog/delegates/layoutnamedelegate.cpp b/app/settings/settingsdialog/delegates/layoutnamedelegate.cpp
index 15982ebb7..3c5abce4d 100644
--- a/app/settings/settingsdialog/delegates/layoutnamedelegate.cpp
+++ b/app/settings/settingsdialog/delegates/layoutnamedelegate.cpp
@@ -99,7 +99,8 @@ void LayoutName::paint(QPainter *painter, const QStyleOptionViewItem &option, co
 
     painter->setRenderHint(QPainter::Antialiasing, true);
 
-    QRect optionRect = Latte::drawChangesIndicatorBackground(painter, option);
+    QRect optionRect = Latte::remainedFromChangesIndicator(option);
+    Latte::drawChangesIndicatorBackground(painter, option);
     adjustedOption.rect = optionRect;
 
     if (isLocked || isConsideredActive) {
diff --git a/app/settings/viewsdialog/delegates/namedelegate.cpp b/app/settings/viewsdialog/delegates/namedelegate.cpp
index 9d74f13ce..c3878dca5 100644
--- a/app/settings/viewsdialog/delegates/namedelegate.cpp
+++ b/app/settings/viewsdialog/delegates/namedelegate.cpp
@@ -81,8 +81,8 @@ void NameDelegate::paint(QPainter *painter, const QStyleOptionViewItem &option,
     }
 
     // draw changes indicator
-    QRect availableTextRect = Latte::drawChangesIndicatorBackground(painter, option);
-
+    QRect availableTextRect = Latte::remainedFromChangesIndicator(option);
+    Latte::drawChangesIndicatorBackground(painter, option);
     if (isChanged) {
         Latte::drawChangesIndicator(painter, option);
     }