diff --git a/client.cpp b/client.cpp
index 0d1e20cdbe..9b72e211f4 100644
--- a/client.cpp
+++ b/client.cpp
@@ -431,7 +431,7 @@ void Client::createDecoration(const QRect& oldgeom)
     connect(this, SIGNAL(shadeChanged()), decoration, SLOT(shadeChange()));
     connect(this, SIGNAL(desktopChanged()), decoration, SLOT(desktopChange()));
     connect(this, SIGNAL(captionChanged()), decoration, SLOT(captionChange()));
-    connect(this, SIGNAL(activeChanged()), decoration, SLOT(activeChange()));
+    connect(this, &Client::activeChanged, decoration, &KDecoration::activeChanged);
     connect(this, SIGNAL(clientMaximizedStateChanged(KWin::Client*,KDecorationDefines::MaximizeMode)),
             decoration, SLOT(maximizeChange()));
     connect(this, SIGNAL(keepAboveChanged(bool)), decoration, SIGNAL(keepAboveChanged(bool)));
diff --git a/clients/aurorae/src/aurorae.cpp b/clients/aurorae/src/aurorae.cpp
index 11f7ade2c2..21ef1d2fd6 100644
--- a/clients/aurorae/src/aurorae.cpp
+++ b/clients/aurorae/src/aurorae.cpp
@@ -306,11 +306,6 @@ bool AuroraeClient::eventFilter(QObject *object, QEvent *event)
     return false;
 }
 
-void AuroraeClient::activeChange()
-{
-    emit activeChanged();
-}
-
 void AuroraeClient::captionChange()
 {
     emit captionChanged();
diff --git a/clients/aurorae/src/aurorae.h b/clients/aurorae/src/aurorae.h
index d167771ebd..80755894e5 100644
--- a/clients/aurorae/src/aurorae.h
+++ b/clients/aurorae/src/aurorae.h
@@ -87,7 +87,6 @@ private:
 class AuroraeClient : public KDecoration
 {
     Q_OBJECT
-    Q_PROPERTY(bool active READ isActive NOTIFY activeChanged)
     Q_PROPERTY(QString caption READ caption NOTIFY captionChanged)
     Q_PROPERTY(int desktop READ desktop WRITE setDesktop NOTIFY desktopChanged)
     Q_PROPERTY(QRect geometry READ geometry)
@@ -119,7 +118,6 @@ public:
     AuroraeClient(KDecorationBridge* bridge, KDecorationFactory* factory);
     virtual ~AuroraeClient();
     virtual bool eventFilter(QObject *object, QEvent *event);
-    virtual void activeChange();
     virtual void borders(int& left, int& right, int& top, int& bottom) const;
     virtual void captionChange();
     virtual void desktopChange();
@@ -140,7 +138,6 @@ public:
     Q_INVOKABLE QVariant readConfig(const QString &key, const QVariant &defaultValue = QVariant());
 
 Q_SIGNALS:
-    void activeChanged();
     void captionChanged();
     void desktopChanged();
     void iconChanged();
diff --git a/libkdecorations/kcommondecoration.cpp b/libkdecorations/kcommondecoration.cpp
index 6a5bc5f62f..555c34ccff 100644
--- a/libkdecorations/kcommondecoration.cpp
+++ b/libkdecorations/kcommondecoration.cpp
@@ -57,6 +57,7 @@ KCommonDecoration::KCommonDecoration(KDecorationBridge* bridge, KDecorationFacto
             this, &KCommonDecoration::decorationButtonsChanged);
     connect(wrapper, &KDecoration::decorationButtonsChanged,
             this, &KCommonDecoration::buttonsChanged);
+    connect(wrapper, &KDecoration::activeChanged, this, &KCommonDecoration::activeChange);
 }
 
 KCommonDecoration::~KCommonDecoration()
diff --git a/libkdecorations/kcommondecoration.h b/libkdecorations/kcommondecoration.h
index 5defecd2ff..daf9af0d6a 100644
--- a/libkdecorations/kcommondecoration.h
+++ b/libkdecorations/kcommondecoration.h
@@ -260,9 +260,9 @@ public:
     virtual void desktopChange();
     virtual void shadeChange();
     virtual void iconChange();
-    virtual void activeChange();
     virtual void captionChange();
 public Q_SLOTS:
+    virtual void activeChange();
     void keepAboveChange(bool above);
     void keepBelowChange(bool below);
     void slotMaximize();
diff --git a/libkdecorations/kcommondecoration_p.cpp b/libkdecorations/kcommondecoration_p.cpp
index aa39335e7d..ddd5079eaa 100644
--- a/libkdecorations/kcommondecoration_p.cpp
+++ b/libkdecorations/kcommondecoration_p.cpp
@@ -68,11 +68,6 @@ QSize KCommonDecorationWrapper::minimumSize() const
     return decoration->minimumSize();
 }
 
-void KCommonDecorationWrapper::activeChange()
-{
-    return decoration->activeChange();
-}
-
 void KCommonDecorationWrapper::captionChange()
 {
     return decoration->captionChange();
diff --git a/libkdecorations/kcommondecoration_p.h b/libkdecorations/kcommondecoration_p.h
index ff07b9fd56..1870ef0429 100644
--- a/libkdecorations/kcommondecoration_p.h
+++ b/libkdecorations/kcommondecoration_p.h
@@ -49,7 +49,6 @@ public:
     virtual void borders(int& left, int& right, int& top, int& bottom) const;
     virtual void resize(const QSize& s);
     virtual QSize minimumSize() const;
-    virtual void activeChange();
     virtual void captionChange();
     virtual void iconChange();
     virtual void maximizeChange();
diff --git a/libkdecorations/kdecoration.h b/libkdecorations/kdecoration.h
index d74511700d..3d394c4b43 100644
--- a/libkdecorations/kdecoration.h
+++ b/libkdecorations/kdecoration.h
@@ -490,6 +490,7 @@ class KWIN_EXPORT KDecoration
     : public QObject, public KDecorationDefines
 {
     Q_OBJECT
+    Q_PROPERTY(bool active READ isActive NOTIFY activeChanged)
 public:
     /**
      * Constructs a KDecoration object. Both the arguments are passed from
@@ -814,11 +815,6 @@ public:
     virtual QSize minimumSize() const = 0;
 
 public Q_SLOTS:
-    /**
-     * This function is called whenever the window either becomes or stops being active.
-     * Use isActive() to find out the current state.
-     */
-    virtual void activeChange() = 0;
     /**
      * This function is called whenever the caption changes. Use caption() to get it.
      */
@@ -845,6 +841,11 @@ public Q_SLOTS:
     virtual void shadeChange() = 0;
 
 Q_SIGNALS:
+    /**
+     * This signal is emitted whenever the window either becomes or stops being active.
+     * Use isActive() to find out the current state.
+     */
+    void activeChanged();
     /**
      * This signal is emitted whenever the window's keep-above state changes.
      */