diff --git a/tiling.cpp b/tiling.cpp
index 4001b2e16a..4ac5c72ce1 100644
--- a/tiling.cpp
+++ b/tiling.cpp
@@ -45,8 +45,17 @@ bool Workspace::tilingEnabled() const
 void Workspace::setTilingEnabled( bool tiling )
     {
     if( tilingEnabled() == tiling ) return;
+
     tilingEnabled_ = tiling;
 
+    KSharedConfig::Ptr _config = KGlobal::config();
+    KConfigGroup config( _config, "Windows" );
+    config.writeEntry("TilingOn", tilingEnabled_);
+    config.sync();
+    options->tilingOn = tilingEnabled_;
+    options->tilingLayout = static_cast<TilingLayoutFactory::Layouts>(config.readEntry( "TilingDefaultLayout", 0 ));
+    options->tilingRaisePolicy = config.readEntry( "TilingRaisePolicy", 0 );
+
     if( tilingEnabled_ )
         {
         tilingLayouts.resize( numberOfDesktops() + 1 );