diff --git a/gui/settings.ui b/gui/settings.ui
index 3ead9bad07d..6db6ec70809 100644
--- a/gui/settings.ui
+++ b/gui/settings.ui
@@ -65,15 +65,9 @@
              <height>20</height>
             </size>
            </property>
-           <property name="inputMask">
-            <string notr="true">009</string>
-           </property>
            <property name="text">
             <string notr="true"/>
            </property>
-           <property name="maxLength">
-            <number>3</number>
-           </property>
            <property name="alignment">
             <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
            </property>
@@ -82,12 +76,12 @@
          <item>
           <widget class="QLabel" name="label_3">
            <property name="text">
-            <string>Ideal count:</string>
+            <string>Max count:</string>
            </property>
           </widget>
          </item>
          <item>
-          <widget class="QLabel" name="mLblIdealThreads">
+          <widget class="QLabel" name="mLblMaxThreads">
            <property name="text">
             <string notr="true">TextLabel</string>
            </property>
diff --git a/gui/settingsdialog.cpp b/gui/settingsdialog.cpp
index e377c1e5cf2..c232ff14c7d 100644
--- a/gui/settingsdialog.cpp
+++ b/gui/settingsdialog.cpp
@@ -63,7 +63,10 @@ SettingsDialog::SettingsDialog(ApplicationList *list,
     QSettings settings;
     mTempApplications->copy(list);
 
+    int maxjobs = QThread::idealThreadCount();
+
     mUI->mJobs->setText(settings.value(SETTINGS_CHECK_THREADS, 1).toString());
+    mUI->mJobs->setValidator(new QIntValidator(1, maxjobs, this));
     mUI->mForce->setCheckState(boolToCheckState(settings.value(SETTINGS_CHECK_FORCE, false).toBool()));
     mUI->mShowFullPath->setCheckState(boolToCheckState(settings.value(SETTINGS_SHOW_FULL_PATH, false).toBool()));
     mUI->mShowNoErrorsMessage->setCheckState(boolToCheckState(settings.value(SETTINGS_SHOW_NO_ERRORS, false).toBool()));
@@ -119,11 +122,7 @@ SettingsDialog::SettingsDialog(ApplicationList *list,
     mUI->mListWidget->setSortingEnabled(false);
     populateApplicationList();
 
-    const int count = QThread::idealThreadCount();
-    if (count != -1)
-        mUI->mLblIdealThreads->setText(QString::number(count));
-    else
-        mUI->mLblIdealThreads->setText(tr("N/A"));
+    mUI->mLblMaxThreads->setText(QString::number(maxjobs));
 
     loadSettings();
     initTranslationsList();
@@ -179,13 +178,9 @@ void SettingsDialog::saveSettings() const
 
 void SettingsDialog::saveSettingValues() const
 {
-    int jobs = mUI->mJobs->text().toInt();
-    if (jobs <= 0) {
-        jobs = 1;
-    }
-
     QSettings settings;
-    settings.setValue(SETTINGS_CHECK_THREADS, jobs);
+    if (mUI->mJobs->hasAcceptableInput())
+        settings.setValue(SETTINGS_CHECK_THREADS, mUI->mJobs->text().toInt());
     saveCheckboxValue(&settings, mUI->mForce, SETTINGS_CHECK_FORCE);
     saveCheckboxValue(&settings, mUI->mSaveAllErrors, SETTINGS_SAVE_ALL_ERRORS);
     saveCheckboxValue(&settings, mUI->mSaveFullPath, SETTINGS_SAVE_FULL_PATH);