diff --git a/app/view/settings/primaryconfigview.cpp b/app/view/settings/primaryconfigview.cpp
index 7ee77530e..c5fc88a97 100644
--- a/app/view/settings/primaryconfigview.cpp
+++ b/app/view/settings/primaryconfigview.cpp
@@ -52,7 +52,7 @@
 
 #define CANVASWINDOWINTERVAL 50
 #define PRIMARYWINDOWINTERVAL 250
-#define SECONDARYWINDOWINTERVAL 250
+#define SECONDARYWINDOWINTERVAL 200
 #define SLIDEOUTINTERVAL 400
 
 namespace Latte {
diff --git a/containment/package/contents/ui/main.qml b/containment/package/contents/ui/main.qml
index 50d0643f0..024fcbe77 100644
--- a/containment/package/contents/ui/main.qml
+++ b/containment/package/contents/ui/main.qml
@@ -220,7 +220,7 @@ Item {
     readonly property bool hasUserSpecifiedBackground: (latteView && latteView.layout && latteView.layout.background.startsWith("/")) ?
                                                            true : false
 
-    readonly property bool inConfigureAppletsMode: root.editMode && (plasmoid.configuration.inConfigureAppletsMode || !LatteCore.WindowSystem.compositingActive)
+    readonly property bool inConfigureAppletsMode: root.editMode && plasmoid.configuration.inConfigureAppletsMode
     readonly property bool parabolicEffectEnabled: parabolic.factor.zoom>1 && !inConfigureAppletsMode
 
     property bool dockIsShownCompletely: !(dockIsHidden || inSlidingIn || inSlidingOut)
diff --git a/shell/package/contents/configuration/canvas/HeaderSettings.qml b/shell/package/contents/configuration/canvas/HeaderSettings.qml
index 047ab378a..14cc9846b 100644
--- a/shell/package/contents/configuration/canvas/HeaderSettings.qml
+++ b/shell/package/contents/configuration/canvas/HeaderSettings.qml
@@ -128,7 +128,7 @@ Item {
         icon: SettingsControls.RearrangeIcon{}
 
         onPressedChanged: {
-            if (LatteCore.WindowSystem.compositingActive && pressed) {
+            if (pressed) {
                 plasmoid.configuration.inConfigureAppletsMode = !plasmoid.configuration.inConfigureAppletsMode;
             }
         }
diff --git a/shell/package/contents/configuration/pages/AppearanceConfig.qml b/shell/package/contents/configuration/pages/AppearanceConfig.qml
index a8612c28e..c534cf80d 100644
--- a/shell/package/contents/configuration/pages/AppearanceConfig.qml
+++ b/shell/package/contents/configuration/pages/AppearanceConfig.qml
@@ -185,7 +185,7 @@ PlasmaComponents.Page {
                     Layout.minimumWidth: dialog.optionsWidth
                     Layout.maximumWidth: Layout.minimumWidth
                     spacing: units.smallSpacing
-                    enabled: plasmoid.configuration.animationsEnabled
+                    enabled: LatteCore.WindowSystem.compositingActive && plasmoid.configuration.animationsEnabled
 
                     PlasmaComponents.Label {
                         text: i18n("Zoom On Hover")