diff --git a/src/plugins/debugger/gdb/gdbengine.cpp b/src/plugins/debugger/gdb/gdbengine.cpp
index f03b07a7004..6d1e91ef856 100644
--- a/src/plugins/debugger/gdb/gdbengine.cpp
+++ b/src/plugins/debugger/gdb/gdbengine.cpp
@@ -194,8 +194,8 @@ GdbEngine::GdbEngine(DebuggerManager *manager) :
 
     m_commandTimer = new QTimer(this);
     m_commandTimer->setSingleShot(true);
-    m_commandTimer->setInterval(
-        1000 * qMin(20, theDebuggerAction(GdbWatchdogTimeout)->value().toInt()));
+    QVariant timeOut = theDebuggerAction(GdbWatchdogTimeout)->value();
+    m_commandTimer->setInterval(1000 * qMax(20, timeOut.toInt()));
     connect(m_commandTimer, SIGNAL(timeout()), SLOT(commandTimeout()));
 
     // Needs no resetting in initializeVariables()
diff --git a/src/plugins/debugger/gdb/gdboptionspage.ui b/src/plugins/debugger/gdb/gdboptionspage.ui
index 3a46c86fd49..55f813f5be5 100644
--- a/src/plugins/debugger/gdb/gdboptionspage.ui
+++ b/src/plugins/debugger/gdb/gdboptionspage.ui
@@ -97,9 +97,6 @@ on slow machines. In this case the value should be increased.</string>
         <property name="layoutDirection">
          <enum>Qt::LeftToRight</enum>
         </property>
-        <property name="specialValueText">
-         <string>&lt;unlimited&gt;</string>
-        </property>
         <property name="minimum">
          <number>20</number>
         </property>