diff --git a/composite.cpp b/composite.cpp
index 31fedebc0f..8f728e0e2f 100644
--- a/composite.cpp
+++ b/composite.cpp
@@ -66,11 +66,6 @@ namespace KWin
 void Workspace::setupCompositing()
     {
 #if defined( HAVE_XCOMPOSITE ) && defined( HAVE_XDAMAGE )
-    // Driver-specific config detection
-    CompositingPrefs prefs;
-    prefs.detect();
-    options->reloadCompositingSettings( prefs );
-
     if( !options->useCompositing )
         {
         kDebug( 1212 ) << "Compositing is turned off in options";
diff --git a/options.cpp b/options.cpp
index 80433b48a2..5a090c84ea 100644
--- a/options.cpp
+++ b/options.cpp
@@ -201,6 +201,11 @@ unsigned long Options::updateSettings()
 //    QToolTip::setGloballyEnabled( d->show_tooltips );
 // KDE4 this probably needs to be done manually in clients
 
+    // Driver-specific config detection
+    CompositingPrefs prefs;
+    prefs.detect();
+    reloadCompositingSettings( prefs );
+
     return changed;
     }
 
diff --git a/options.h b/options.h
index 51a526b68b..4efee911af 100644
--- a/options.h
+++ b/options.h
@@ -34,7 +34,6 @@ class Options : public KDecorationOptions
         ~Options();
 
         virtual unsigned long updateSettings();
-        void reloadCompositingSettings(const CompositingPrefs& prefs);
 
         /*!
           Different focus policies:
@@ -339,6 +338,7 @@ class Options : public KDecorationOptions
         QStringList ignoreFocusStealingClasses;
 
         MouseCommand wheelToMouseCommand( MouseWheelCommand com, int delta );
+        void reloadCompositingSettings(const CompositingPrefs& prefs);
     };
 
 extern Options* options;