diff --git a/scene_opengl.cpp b/scene_opengl.cpp
index 54d3473851..8f63d6867c 100644
--- a/scene_opengl.cpp
+++ b/scene_opengl.cpp
@@ -75,6 +75,7 @@ Sources and other compositing managers:
 
 #include "utils.h"
 #include "client.h"
+#include "composite.h"
 #include "deleted.h"
 #include "effects.h"
 #include "lanczosfilter.h"
@@ -131,7 +132,8 @@ void SceneOpenGL::initColorCorrection()
 {
     kDebug(1212) << "Color correction:" << options->isColorCorrected();
     m_colorCorrection->setEnabled(options->isColorCorrected());
-    connect(m_colorCorrection, SIGNAL(changed()), wspace, SLOT(addRepaintFull()));
+    connect(m_colorCorrection, SIGNAL(changed()), Compositor::self(), SLOT(addRepaintFull()));
+    connect(options, SIGNAL(colorCorrectedChanged()), Compositor::self(), SLOT(slotReinitialize()));
 }
 
 bool SceneOpenGL::selectMode()
diff --git a/workspace.cpp b/workspace.cpp
index 3733af01cf..258a237534 100644
--- a/workspace.cpp
+++ b/workspace.cpp
@@ -201,7 +201,6 @@ Workspace::Workspace(bool restore)
     m_compositor = Compositor::createCompositor(this);
     connect(this, SIGNAL(currentDesktopChanged(int,KWin::Client*)), m_compositor, SLOT(addRepaintFull()));
     connect(m_compositor, SIGNAL(compositingToggled(bool)), SLOT(slotCompositingToggled()));
-    connect(options, SIGNAL(glColorCorrectionChanged()), m_compositor, SLOT(resetCompositing()));
 
     new DBusInterface(this);