diff --git a/kdeplasma-addons/applets/kolourpicker/kolourpicker.cpp b/kdeplasma-addons/applets/kolourpicker/kolourpicker.cpp
index 8b3490b3..38e91e8e 100644
--- a/kdeplasma-addons/applets/kolourpicker/kolourpicker.cpp
+++ b/kdeplasma-addons/applets/kolourpicker/kolourpicker.cpp
@@ -305,17 +305,14 @@ void Kolourpicker::configChanged()
 void Kolourpicker::constraintsEvent(Plasma::Constraints constraints)
 {
     if (constraints & Plasma::FormFactorConstraint) {
-        if (formFactor() == Plasma::Planar) {
+        const Plasma::FormFactor formfactor = formFactor();
+        if (formfactor == Plasma::Planar) {
             setBackgroundHints(Plasma::Applet::StandardBackground);
         } else {
             setBackgroundHints(Plasma::Applet::NoBackground);
         }
-    }
-
-    if (constraints & Plasma::FormFactorConstraint ||
-        constraints & Plasma::SizeConstraint) {
         QGraphicsLinearLayout *l = dynamic_cast<QGraphicsLinearLayout *>(layout());
-        if (formFactor() == Plasma::Horizontal && size().height() < 40) {
+        if (formfactor == Plasma::Horizontal) {
             l->setOrientation(Qt::Horizontal);
         } else {
             l->setOrientation(Qt::Vertical);