diff --git a/kcontrol/launch/kcmlaunch.cpp b/kcontrol/launch/kcmlaunch.cpp
index 9855b503..993dd3a7 100644
--- a/kcontrol/launch/kcmlaunch.cpp
+++ b/kcontrol/launch/kcmlaunch.cpp
@@ -78,7 +78,7 @@ LaunchConfig::LaunchConfig(QWidget * parent, const QVariantList &)
     lbl_cursorTimeout->setText(i18n("&Startup indication timeout:"));
     GroupBox1Layout->addWidget(lbl_cursorTimeout, 2, 0);
     sb_cursorTimeout = new KIntNumInput( GroupBox1);
-    sb_cursorTimeout->setRange( 0, 99 );
+    sb_cursorTimeout->setRange(1, 99);
     sb_cursorTimeout->setSuffix(i18n(" sec"));
     GroupBox1Layout->addWidget(sb_cursorTimeout, 2, 1);
     lbl_cursorTimeout->setBuddy(sb_cursorTimeout);
diff --git a/kwin/effects/startupfeedback/startupfeedback.cpp b/kwin/effects/startupfeedback/startupfeedback.cpp
index 0c70b030..bc77f76a 100644
--- a/kwin/effects/startupfeedback/startupfeedback.cpp
+++ b/kwin/effects/startupfeedback/startupfeedback.cpp
@@ -91,7 +91,7 @@ void StartupFeedbackEffect::reconfigure(Effect::ReconfigureFlags flags)
     const bool busyCursor = c.readEntry("BusyCursor", true);
     c = conf.group("BusyCursorSettings");
     const int timeout = c.readEntry("Timeout", 10);
-    m_startupInfo->setTimeout(timeout);
+    m_startupInfo->setTimeout(qMax(timeout, 1));
     if (!busyCursor) {
         m_type = StartupFeedbackEffect::NoFeedback;
     } else {