diff --git a/plugins/paintops/libpaintop/kis_airbrush_option_widget.cpp b/plugins/paintops/libpaintop/kis_airbrush_option_widget.cpp
index eb421be299973911ffa95b6858678567d20bdfa1..cf3d5e85f2a6010a8c531f6e8a88a4326deae347 100644
--- a/plugins/paintops/libpaintop/kis_airbrush_option_widget.cpp
+++ b/plugins/paintops/libpaintop/kis_airbrush_option_widget.cpp
@@ -88,6 +88,9 @@ void KisAirbrushOptionWidget::writeOptionSetting(KisPropertiesConfigurationSP se
     }
     setting->setProperty(AIRBRUSH_ENABLED, isChecked());
     setting->setProperty(AIRBRUSH_RATE, 1000.0 / m_d->airbrushInterval);
+
+    qDebug() << "writeOptionSetting. Interval:" << m_d->airbrushInterval << "Calculated rate" << 1000.0 / m_d->airbrushInterval << "Rate in widget" << m_d->configPage->sliderRate->value();
+
     setting->setProperty(AIRBRUSH_IGNORE_SPACING, m_d->ignoreSpacing);
 }
 
@@ -97,8 +100,9 @@ void KisAirbrushOptionWidget::readOptionSetting(const KisPropertiesConfiguration
     // Update settings in the widget. The widget's signals should cause the changes to be propagated
     // to this->m_d as well.
     m_d->configPage->sliderRate->setValue(setting->getDouble(AIRBRUSH_RATE, DEFAULT_RATE));
-    m_d->configPage->checkBoxIgnoreSpacing->setChecked(setting->getBool(AIRBRUSH_IGNORE_SPACING,
-                                                                        false));
+
+    qDebug() << "readOptionSetting. Interval:" << m_d->airbrushInterval << "Rate from settings" << setting->getDouble(AIRBRUSH_RATE, DEFAULT_RATE) << "Rate in widget" << m_d->configPage->sliderRate->value();
+    m_d->configPage->checkBoxIgnoreSpacing->setChecked(setting->getBool(AIRBRUSH_IGNORE_SPACING, false));
 }
 
 qreal KisAirbrushOptionWidget::airbrushInterval() const
@@ -131,9 +135,23 @@ void KisAirbrushOptionWidget::updateInterval()
         rate = 1.0;
     }
     m_d->airbrushInterval = 1000.0 / rate;
+    qDebug() << "updateInterval();. Interval:" << m_d->airbrushInterval << "Rate in widget" << m_d->configPage->sliderRate->value();
 }
 
 void KisAirbrushOptionWidget::updateIgnoreSpacing()
 {
     m_d->ignoreSpacing = m_d->configPage->checkBoxIgnoreSpacing->isChecked();
 }
+
+
+void KisAirbrushOptionProperties::readOptionSettingImpl(const KisPropertiesConfiguration *setting){
+    enabled = setting->getBool(AIRBRUSH_ENABLED);
+    airbrushInterval = 1000.0 / setting->getDouble(AIRBRUSH_RATE, DEFAULT_RATE);
+    ignoreSpacing = setting->getBool(AIRBRUSH_IGNORE_SPACING, false);
+}
+
+void KisAirbrushOptionProperties::writeOptionSettingImpl(KisPropertiesConfiguration *setting) const{
+    setting->setProperty(AIRBRUSH_ENABLED, enabled);
+    setting->setProperty(AIRBRUSH_RATE, 1000.0 / airbrushInterval > 0 ? airbrushInterval : 1.0);
+    setting->setProperty(AIRBRUSH_IGNORE_SPACING, ignoreSpacing);
+}
diff --git a/plugins/paintops/libpaintop/kis_airbrush_option_widget.h b/plugins/paintops/libpaintop/kis_airbrush_option_widget.h
index b7a18a954f80fa6fb13825f3051170e21156843a..ab6d443ef0c752f1fc862dd6d458bd1d316ecfa0 100644
--- a/plugins/paintops/libpaintop/kis_airbrush_option_widget.h
+++ b/plugins/paintops/libpaintop/kis_airbrush_option_widget.h
@@ -63,10 +63,15 @@ private:
     Private *const m_d;
 };
 
-//class KisAirbrushOptionProperties : public KisPaintopPropertiesBase
-//{
-//protected:
-//};
+struct KisAirbrushOptionProperties : public KisPaintopPropertiesBase
+{
+    bool enabled {false};
+    qreal airbrushInterval {1000.0 / 20.0};
+    bool ignoreSpacing {false};
+
+    void readOptionSettingImpl(const KisPropertiesConfiguration *setting) override;
+    void writeOptionSettingImpl(KisPropertiesConfiguration *setting) const override;
+};
 
 
 #endif