diff --git a/CMakeLists.txt b/CMakeLists.txt
index f667844443..0cc7a4d9b5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -90,7 +90,6 @@ find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS
     KCMUtils
     NewStuff
     Service
-    TextWidgets
     XmlGui
 )
 
diff --git a/src/effects/mousemark/CMakeLists.txt b/src/effects/mousemark/CMakeLists.txt
index 9338165974..ede130c959 100644
--- a/src/effects/mousemark/CMakeLists.txt
+++ b/src/effects/mousemark/CMakeLists.txt
@@ -33,7 +33,6 @@ target_link_libraries(kwin_mousemark_config
     KF5::CoreAddons
     KF5::GlobalAccel
     KF5::I18n
-    KF5::TextWidgets
     KF5::XmlGui
     KWinEffectsInterface
 )
diff --git a/src/effects/mousemark/mousemark_config.cpp b/src/effects/mousemark/mousemark_config.cpp
index 6ea43686e5..bba3222893 100644
--- a/src/effects/mousemark/mousemark_config.cpp
+++ b/src/effects/mousemark/mousemark_config.cpp
@@ -39,8 +39,6 @@ MouseMarkEffectConfig::MouseMarkEffectConfig(QWidget* parent, const QVariantList
 {
     m_ui = new MouseMarkEffectConfigForm(this);
 
-    m_ui->kcfg_LineWidth->setSuffix(ki18ncp("Suffix", " pixel", " pixels"));
-
     QVBoxLayout* layout = new QVBoxLayout(this);
 
     layout->addWidget(m_ui);
@@ -66,7 +64,9 @@ MouseMarkEffectConfig::MouseMarkEffectConfig(QWidget* parent, const QVariantList
 
     m_ui->editor->addCollection(m_actionCollection);
 
-    load();
+    connect(m_ui->kcfg_LineWidth, qOverload<int>(&QSpinBox::valueChanged), this, [this]() {
+        updateSpinBoxSuffix();
+    });
 }
 
 MouseMarkEffectConfig::~MouseMarkEffectConfig()
@@ -75,6 +75,13 @@ MouseMarkEffectConfig::~MouseMarkEffectConfig()
     m_ui->editor->undo();
 }
 
+void MouseMarkEffectConfig::load()
+{
+    KCModule::load();
+
+    updateSpinBoxSuffix();
+}
+
 void MouseMarkEffectConfig::save()
 {
     qDebug() << "Saving config of MouseMark" ;
@@ -89,6 +96,11 @@ void MouseMarkEffectConfig::save()
     interface.reconfigureEffect(QStringLiteral("mousemark"));
 }
 
+void MouseMarkEffectConfig::updateSpinBoxSuffix()
+{
+    m_ui->kcfg_LineWidth->setSuffix(i18ncp("Suffix", " pixel", " pixels", m_ui->kcfg_LineWidth->value()));
+}
+
 } // namespace
 
 #include "mousemark_config.moc"
diff --git a/src/effects/mousemark/mousemark_config.h b/src/effects/mousemark/mousemark_config.h
index 8a33ea1b38..4c03de800b 100644
--- a/src/effects/mousemark/mousemark_config.h
+++ b/src/effects/mousemark/mousemark_config.h
@@ -33,9 +33,12 @@ public:
     explicit MouseMarkEffectConfig(QWidget* parent = nullptr, const QVariantList& args = QVariantList());
     ~MouseMarkEffectConfig() override;
 
+    void load() override;
     void save() override;
 
 private:
+    void updateSpinBoxSuffix();
+
     MouseMarkEffectConfigForm* m_ui;
     KActionCollection* m_actionCollection;
 };
diff --git a/src/effects/mousemark/mousemark_config.ui b/src/effects/mousemark/mousemark_config.ui
index b799029841..8575afac78 100644
--- a/src/effects/mousemark/mousemark_config.ui
+++ b/src/effects/mousemark/mousemark_config.ui
@@ -54,7 +54,7 @@
        </widget>
       </item>
       <item row="1" column="1">
-       <widget class="KPluralHandlingSpinBox" name="kcfg_LineWidth">
+       <widget class="QSpinBox" name="kcfg_LineWidth">
         <property name="minimum">
          <number>1</number>
         </property>
@@ -103,11 +103,6 @@
    <header>kshortcutseditor.h</header>
    <container>1</container>
   </customwidget>
-  <customwidget>
-   <class>KPluralHandlingSpinBox</class>
-   <extends>QSpinBox</extends>
-   <header>kpluralhandlingspinbox.h</header>
-  </customwidget>
  </customwidgets>
  <resources/>
  <connections/>