diff --git a/effects/morphingpopups/package/contents/code/morphingpopups.js b/effects/morphingpopups/package/contents/code/morphingpopups.js
index 838964f6e2..98c167d666 100644
--- a/effects/morphingpopups/package/contents/code/morphingpopups.js
+++ b/effects/morphingpopups/package/contents/code/morphingpopups.js
@@ -38,6 +38,13 @@ var morphingEffect = {
         //don't cross the whole screen: ugly
         var distance = Math.abs(oldGeometry.x - newGeometry.x) + Math.abs(oldGeometry.y - newGeometry.y);
 
+        if (newGeometry.x == oldGeometry.x &&
+                newGeometry.y == oldGeometry.y &&
+                newGeometry.width == oldGeometry.width &&
+                newGeometry.height == oldGeometry.height) {
+            return;
+        }
+
         if (distance > (newGeometry.width + newGeometry.height) * 2) {
             if (window.moveAnimation) {
                 delete window.moveAnimation;
diff --git a/kcmkwin/kwindecoration/kwindecorationsettings.kcfg b/kcmkwin/kwindecoration/kwindecorationsettings.kcfg
index 496cecf853..b13b7d7067 100644
--- a/kcmkwin/kwindecoration/kwindecorationsettings.kcfg
+++ b/kcmkwin/kwindecoration/kwindecorationsettings.kcfg
@@ -3,6 +3,7 @@
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
       xsi:schemaLocation="http://www.kde.org/standards/kcfg/1.0
       http://www.kde.org/standards/kcfg/1.0/kcfg.xsd" >
+  <include>config-kwin.h</include>
   <kcfgfile name="kwinrc" />
   <group name="org.kde.kdecoration2">
     <entry name="pluginName" key="library" type="String">