diff --git a/data/kwin_update_tabbox_settings.upd b/data/kwin_update_tabbox_settings.upd
index 95420a4d97..11957fab9b 100644
--- a/data/kwin_update_tabbox_settings.upd
+++ b/data/kwin_update_tabbox_settings.upd
@@ -1,2 +1,2 @@
-Id=Kwin-Tabbox
+Id=Kwin-4.4
 Script=kwin_update_tabbox_settings
diff --git a/data/update_tabbox_settings.cpp b/data/update_tabbox_settings.cpp
index 87a76a4c22..d43e835daf 100644
--- a/data/update_tabbox_settings.cpp
+++ b/data/update_tabbox_settings.cpp
@@ -45,6 +45,15 @@ int main( int argc, char* argv[] )
     if( !tabbox.hasKey("ShowTabBox") )
         tabbox.writeEntry("ShowTabBox", (style.compare("KDE", Qt::CaseInsensitive) == 0)?true:false);
     tabbox.sync();
+    // screen edges - disable quick tiling when switch on desktop edge is activated
+    KConfigGroup borders(&config, "ElectricBorders");
+    if( borders.readEntry<int>("ElectricBorders", 0) >= 1 &&
+        !borders.hasKey("ElectricBorderMaximize") && !borders.hasKey("ElectricBorderTiling") )
+        {
+        borders.writeEntry("ElectricBorderMaximize", false);
+        borders.writeEntry("ElectricBorderTiling", false);
+        }
+    borders.sync();
     config.sync();
     // Send signal to all kwin instances
     QDBusMessage message =