diff --git a/geometry.cpp b/geometry.cpp
index dd0852ea51..d7525fe184 100644
--- a/geometry.cpp
+++ b/geometry.cpp
@@ -2640,8 +2640,6 @@ void Client::finishMoveResize(bool cancel)
     if (isElectricBorderMaximizing()) {
         setQuickTileMode(electricMode);
         electricMaximizing = false;
-        outline()->hide();
-        elevate(false);
     } else if (!cancel) {
         if (!(maximizeMode() & MaximizeHorizontal)) {
             geom_restore.setX(geometry().x());
@@ -2684,6 +2682,10 @@ void Client::leaveMoveResize()
     syncRequest.timeout = NULL;
     if (ScreenEdges::self()->isDesktopSwitchingMovingClients())
         ScreenEdges::self()->reserveDesktopSwitching(false, Qt::Vertical|Qt::Horizontal);
+    if (isElectricBorderMaximizing()) {
+        outline()->hide();
+        elevate(false);
+    }
 }
 
 // This function checks if it actually makes sense to perform a restricted move/resize.
diff --git a/kcmkwin/kwinscreenedges/main.cpp b/kcmkwin/kwinscreenedges/main.cpp
index 54c8cd8153..997e87bb86 100644
--- a/kcmkwin/kwinscreenedges/main.cpp
+++ b/kcmkwin/kwinscreenedges/main.cpp
@@ -392,33 +392,22 @@ void KWinScreenEdgesConfig::monitorDefaults()
 void KWinScreenEdgesConfig::monitorShowEvent()
 {
     // Check if they are enabled
-    KConfigGroup config(m_config, "Compositing");
-    if (config.readEntry("Enabled", true)) {
-        // Compositing enabled
-        config = KConfigGroup(m_config, "Plugins");
+    KConfigGroup config(m_config, "Plugins");
 
-        // Present Windows
-        bool enabled = effectEnabled(BuiltInEffect::PresentWindows, config);
-        monitorItemSetEnabled(int(PresentWindowsCurrent), enabled);
-        monitorItemSetEnabled(int(PresentWindowsAll), enabled);
+    // Present Windows
+    bool enabled = effectEnabled(BuiltInEffect::PresentWindows, config);
+    monitorItemSetEnabled(int(PresentWindowsCurrent), enabled);
+    monitorItemSetEnabled(int(PresentWindowsAll), enabled);
 
-        // Desktop Grid
-        enabled = effectEnabled(BuiltInEffect::DesktopGrid, config);
-        monitorItemSetEnabled(int(DesktopGrid), enabled);
+    // Desktop Grid
+    enabled = effectEnabled(BuiltInEffect::DesktopGrid, config);
+    monitorItemSetEnabled(int(DesktopGrid), enabled);
 
-        // Desktop Cube
-        enabled = effectEnabled(BuiltInEffect::Cube, config);
-        monitorItemSetEnabled(int(Cube), enabled);
-        monitorItemSetEnabled(int(Cylinder), enabled);
-        monitorItemSetEnabled(int(Sphere), enabled);
-    } else { // Compositing disabled
-        monitorItemSetEnabled(int(PresentWindowsCurrent), false);
-        monitorItemSetEnabled(int(PresentWindowsAll), false);
-        monitorItemSetEnabled(int(DesktopGrid), false);
-        monitorItemSetEnabled(int(Cube), false);
-        monitorItemSetEnabled(int(Cylinder), false);
-        monitorItemSetEnabled(int(Sphere), false);
-    }
+    // Desktop Cube
+    enabled = effectEnabled(BuiltInEffect::Cube, config);
+    monitorItemSetEnabled(int(Cube), enabled);
+    monitorItemSetEnabled(int(Cylinder), enabled);
+    monitorItemSetEnabled(int(Sphere), enabled);
     // tabbox, depends on reasonable focus policy.
     KConfigGroup config2(m_config, "Windows");
     QString focusPolicy = config2.readEntry("FocusPolicy", QString());
diff --git a/scene_opengl.cpp b/scene_opengl.cpp
index 77783f3e36..b4be490047 100644
--- a/scene_opengl.cpp
+++ b/scene_opengl.cpp
@@ -912,6 +912,14 @@ SceneOpenGL2::SceneOpenGL2(OpenGLBackend *backend)
         // base ctor already failed
         return;
     }
+
+    // We only support the OpenGL 2+ shader API, not GL_ARB_shader_objects
+    if (!hasGLVersion(2, 0)) {
+        qDebug() << "OpenGL 2.0 is not supported";
+        init_ok = false;
+        return;
+    }
+
     // Initialize color correction before the shaders
     slotColorCorrectedChanged(false);
     connect(options, SIGNAL(colorCorrectedChanged()), this, SLOT(slotColorCorrectedChanged()), Qt::QueuedConnection);