diff --git a/activation.cpp b/activation.cpp
index c07a2b63cd..911e9e65c8 100644
--- a/activation.cpp
+++ b/activation.cpp
@@ -42,7 +42,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "group.h"
 #include "rules.h"
 #include <QX11Info>
-#include "tiling/tiling.h"
 
 namespace KWin
 {
@@ -263,9 +262,6 @@ void Workspace::setActiveClient(Client* c, allowed_t)
     if (active_client) {
         active_client->sl_activated();
     }
-
-    if (m_tiling->tilingEnabled())
-        m_tiling->notifyTilingWindowActivated(active_client);
     --set_active_client_recursion;
 }
 
diff --git a/tiling/tiling.cpp b/tiling/tiling.cpp
index 904ecea520..39660d9fd4 100644
--- a/tiling/tiling.cpp
+++ b/tiling/tiling.cpp
@@ -96,6 +96,7 @@ void Tiling::setTilingEnabled(bool tiling)
         connect(m_workspace, SIGNAL(clientAdded(KWin::Client*)), this, SLOT(slotResizeTilingLayouts()));
         connect(m_workspace, SIGNAL(numberDesktopsChanged(int)), this, SLOT(slotResizeTilingLayouts()));
         connect(m_workspace, SIGNAL(clientRemoved(KWin::Client*)), this, SLOT(removeTile(KWin::Client*)));
+        connect(m_workspace, SIGNAL(clientActivated(KWin::Client*)), this, SLOT(notifyTilingWindowActivated(KWin::Client*)));
         tilingLayouts.resize(Workspace::self()->numberOfDesktops() + 1);
         foreach (Client * c, Workspace::self()->stackingOrder()) {
             createTile(c);
@@ -265,7 +266,7 @@ void Tiling::notifyTilingWindowDesktopChanged(Client *c, int old_desktop)
 /*
  * Implements the 3 raising modes in Window Behaviour -> Advanced
  */
-void Tiling::notifyTilingWindowActivated(Client *c)
+void Tiling::notifyTilingWindowActivated(KWin::Client *c)
 {
     if (c == NULL)
         return;
diff --git a/tiling/tiling.h b/tiling/tiling.h
index 52543c8120..a59bac84d4 100644
--- a/tiling/tiling.h
+++ b/tiling/tiling.h
@@ -53,7 +53,6 @@ public:
     void notifyTilingWindowResizeDone(Client *c, const QRect &moveResizeGeom, const QRect &orig, bool canceled);
     void notifyTilingWindowMoveDone(Client *c, const QRect &moveResizeGeom, const QRect &orig, bool canceled);
     void notifyTilingWindowDesktopChanged(Client *c, int old_desktop);
-    void notifyTilingWindowActivated(Client *c);
     void notifyTilingWindowMaximized(Client *c, KDecorationDefines::WindowOperation op);
 
     KDecorationDefines::Position supportedTilingResizeMode(Client *c, KDecorationDefines::Position currentMode);
@@ -82,6 +81,8 @@ public Q_SLOTS:
 
     // NOTE: debug method
     void dumpTiles() const;
+
+    void notifyTilingWindowActivated(KWin::Client *c);
 private:
     // try to get a decent tile, either the one with
     // focus or the one below the mouse.