diff --git a/gwenview/app/imageviewconfigpage.ui b/gwenview/app/imageviewconfigpage.ui
index 8cbc505b..51ec9337 100644
--- a/gwenview/app/imageviewconfigpage.ui
+++ b/gwenview/app/imageviewconfigpage.ui
@@ -351,7 +351,7 @@
    <item row="14" column="1">
     <layout class="QHBoxLayout" name="horizontalLayout_6">
      <item>
-      <widget class="KIntSpinBox" name="kcfg_ThumbnailBarRowCount">
+      <widget class="KIntNumInput" name="kcfg_ThumbnailBarRowCount">
        <property name="minimum">
         <number>1</number>
        </property>
@@ -421,8 +421,8 @@
    <header>kcolorbutton.h</header>
   </customwidget>
   <customwidget>
-   <class>KIntSpinBox</class>
-   <extends>QSpinBox</extends>
+   <class>KIntNumInput</class>
+   <extends>QWidget</extends>
    <header>knuminput.h</header>
   </customwidget>
  </customwidgets>
diff --git a/gwenview/lib/crop/cropwidget.ui b/gwenview/lib/crop/cropwidget.ui
index a08df5cc..e234ad35 100644
--- a/gwenview/lib/crop/cropwidget.ui
+++ b/gwenview/lib/crop/cropwidget.ui
@@ -92,7 +92,7 @@
        </widget>
       </item>
       <item>
-       <widget class="KIntSpinBox" name="leftSpinBox">
+       <widget class="KIntNumInput" name="leftSpinBox">
         <property name="sizePolicy">
          <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
           <horstretch>1</horstretch>
@@ -102,7 +102,7 @@
        </widget>
       </item>
       <item>
-       <widget class="KIntSpinBox" name="topSpinBox">
+       <widget class="KIntNumInput" name="topSpinBox">
         <property name="sizePolicy">
          <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
           <horstretch>1</horstretch>
@@ -125,7 +125,7 @@
        </widget>
       </item>
       <item>
-       <widget class="KIntSpinBox" name="widthSpinBox">
+       <widget class="KIntNumInput" name="widthSpinBox">
         <property name="sizePolicy">
          <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
           <horstretch>1</horstretch>
@@ -135,7 +135,7 @@
        </widget>
       </item>
       <item>
-       <widget class="KIntSpinBox" name="heightSpinBox">
+       <widget class="KIntNumInput" name="heightSpinBox">
         <property name="sizePolicy">
          <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
           <horstretch>1</horstretch>
@@ -181,8 +181,8 @@
    <header>kcombobox.h</header>
   </customwidget>
   <customwidget>
-   <class>KIntSpinBox</class>
-   <extends>QSpinBox</extends>
+   <class>KIntNumInput</class>
+   <extends>QWidget</extends>
    <header>knuminput.h</header>
   </customwidget>
  </customwidgets>
diff --git a/gwenview/lib/redeyereduction/redeyereductionwidget.ui b/gwenview/lib/redeyereduction/redeyereductionwidget.ui
index ab6daf6d..21f1af59 100644
--- a/gwenview/lib/redeyereduction/redeyereductionwidget.ui
+++ b/gwenview/lib/redeyereduction/redeyereductionwidget.ui
@@ -42,7 +42,7 @@
         </widget>
        </item>
        <item>
-        <widget class="KIntSpinBox" name="diameterSpinBox">
+        <widget class="KIntNumInput" name="diameterSpinBox">
          <property name="minimum">
           <number>2</number>
          </property>
@@ -84,8 +84,8 @@
    <header>kdialogbuttonbox.h</header>
   </customwidget>
   <customwidget>
-   <class>KIntSpinBox</class>
-   <extends>QSpinBox</extends>
+   <class>KIntNumInput</class>
+   <extends>QWidget</extends>
    <header>knuminput.h</header>
   </customwidget>
  </customwidgets>
diff --git a/gwenview/lib/resize/resizeimagewidget.ui b/gwenview/lib/resize/resizeimagewidget.ui
index 8debbac9..83d3dd8e 100644
--- a/gwenview/lib/resize/resizeimagewidget.ui
+++ b/gwenview/lib/resize/resizeimagewidget.ui
@@ -95,13 +95,7 @@
    <item row="2" column="1">
     <layout class="QHBoxLayout" name="horizontalLayout_2">
      <item>
-      <widget class="KIntSpinBox" name="mWidthSpinBox">
-       <property name="readOnly">
-        <bool>false</bool>
-       </property>
-       <property name="buttonSymbols">
-        <enum>QAbstractSpinBox::UpDownArrows</enum>
-       </property>
+      <widget class="KIntNumInput" name="mWidthSpinBox">
        <property name="minimum">
         <number>1</number>
        </property>
@@ -118,7 +112,7 @@
       </widget>
      </item>
      <item>
-      <widget class="KIntSpinBox" name="mHeightSpinBox">
+      <widget class="KIntNumInput" name="mHeightSpinBox">
        <property name="minimum">
         <number>1</number>
        </property>
@@ -143,8 +137,8 @@
  </widget>
  <customwidgets>
   <customwidget>
-   <class>KIntSpinBox</class>
-   <extends>QSpinBox</extends>
+   <class>KIntNumInput</class>
+   <extends>QWidget</extends>
    <header>knuminput.h</header>
   </customwidget>
  </customwidgets>
diff --git a/kdeplasma-addons/wallpapers/virus/virusconfig.ui b/kdeplasma-addons/wallpapers/virus/virusconfig.ui
index 944b2be2..806d5912 100644
--- a/kdeplasma-addons/wallpapers/virus/virusconfig.ui
+++ b/kdeplasma-addons/wallpapers/virus/virusconfig.ui
@@ -46,7 +46,7 @@
       </widget>
      </item>
      <item row="0" column="3">
-      <widget class="KIntSpinBox" name="m_updateInterval">
+      <widget class="KIntNumInput" name="m_updateInterval">
        <property name="suffix">
         <string> ms</string>
        </property>
@@ -109,7 +109,7 @@
       </widget>
      </item>
      <item row="1" column="3">
-      <widget class="KIntSpinBox" name="m_maxCells">
+      <widget class="KIntNumInput" name="m_maxCells">
        <property name="minimum">
         <number>200</number>
        </property>
@@ -204,8 +204,8 @@
    <header>itemsview.h</header>
   </customwidget>
   <customwidget>
-   <class>KIntSpinBox</class>
-   <extends>QSpinBox</extends>
+   <class>KIntNumInput</class>
+   <extends>QWidget</extends>
    <header>knuminput.h</header>
   </customwidget>
   <customwidget>
diff --git a/ksnapshot/ksnapshotwidget.ui b/ksnapshot/ksnapshotwidget.ui
index 2a26f7a6..dea39a7a 100644
--- a/ksnapshot/ksnapshotwidget.ui
+++ b/ksnapshot/ksnapshotwidget.ui
@@ -161,7 +161,7 @@ You can also copy the image to the clipboard by pressing Ctrl+C.</string>
       </widget>
      </item>
      <item row="1" column="1">
-      <widget class="KIntSpinBox" name="spinDelay">
+      <widget class="KIntNumInput" name="spinDelay">
        <property name="sizePolicy">
         <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
          <horstretch>0</horstretch>
@@ -241,8 +241,8 @@ If &lt;i&gt;no delay&lt;/i&gt; is set, the program will wait for a mouse click b
  </widget>
  <customwidgets>
   <customwidget>
-   <class>KIntSpinBox</class>
-   <extends>QSpinBox</extends>
+   <class>KIntNumInput</class>
+   <extends>QWidget</extends>
    <header>knuminput.h</header>
   </customwidget>
   <customwidget>
diff --git a/okular/conf/dlggeneralbase.ui b/okular/conf/dlggeneralbase.ui
index 4d8e622c..a30e9ac2 100755
--- a/okular/conf/dlggeneralbase.ui
+++ b/okular/conf/dlggeneralbase.ui
@@ -273,7 +273,7 @@
        </widget>
       </item>
       <item row="0" column="1">
-       <widget class="KIntSpinBox" name="kcfg_ViewColumns">
+       <widget class="KIntNumInput" name="kcfg_ViewColumns">
         <property name="minimum">
          <number>3</number>
         </property>
@@ -299,7 +299,7 @@
        </widget>
       </item>
       <item row="1" column="1">
-       <widget class="KIntSpinBox" name="kcfg_ScrollOverlap">
+       <widget class="KIntNumInput" name="kcfg_ScrollOverlap">
         <property name="suffix">
          <string>%</string>
         </property>
@@ -390,8 +390,8 @@ For files which were opened before the previous zoom is applied.</string>
    <container>1</container>
   </customwidget>
   <customwidget>
-   <class>KIntSpinBox</class>
-   <extends>QSpinBox</extends>
+   <class>KIntNumInput</class>
+   <extends>QWidget</extends>
    <header>knuminput.h</header>
   </customwidget>
  </customwidgets>
diff --git a/okular/conf/dlgpresentationbase.ui b/okular/conf/dlgpresentationbase.ui
index f877a8f0..3c25196f 100644
--- a/okular/conf/dlgpresentationbase.ui
+++ b/okular/conf/dlgpresentationbase.ui
@@ -41,7 +41,7 @@
          </widget>
         </item>
         <item>
-         <widget class="KIntSpinBox" name="kcfg_SlidesAdvanceTime" >
+         <widget class="KIntNumInput" name="kcfg_SlidesAdvanceTime" >
           <property name="enabled" >
            <bool>false</bool>
           </property>
@@ -313,8 +313,8 @@
    <header>kcolorbutton.h</header>
   </customwidget>
   <customwidget>
-   <class>KIntSpinBox</class>
-   <extends>KIntSpinBox</extends>
+   <class>KIntNumInput</class>
+   <extends>QWidget</extends>
    <header>knuminput.h</header>
   </customwidget>
  </customwidgets>
diff --git a/okular/core/textdocumentsettings.h b/okular/core/textdocumentsettings.h
index 1af9ea77..c6a62f37 100644
--- a/okular/core/textdocumentsettings.h
+++ b/okular/core/textdocumentsettings.h
@@ -29,7 +29,7 @@ class TextDocumentSettingsPrivate;
  *
  * In .h header:
  * {code}
- * class KIntSpinBox;
+ * class KIntNumInput;
  * ...
  *
  * class YourGenerator
@@ -41,14 +41,14 @@ class TextDocumentSettingsPrivate;
  * ...
  * private:
  *     QString customArgument;
- *     KIntSpinBox *customArgumentWidget;
+ *     KIntNumInput *customArgumentWidget;
  * ...
  * }
  * {/code}
  *
  * In .cpp module:
  * {code}
- * #include <KIntSpinBox>
+ * #include <KIntNumInput>
  * ...
  * bool YourGenerator::reparseConfig()
  * {
@@ -58,7 +58,7 @@ class TextDocumentSettingsPrivate;
  * {
  *     Okular::TextDocumentSettingsWidget *widget = new Okular::TextDocumentSettingsWidget();
  *
- *     KIntSpinBox *customArgumentWidget = new KIntSpinBox( dlg );
+ *     KIntNumInput *customArgumentWidget = new KIntNumInput( dlg );
  *     customArgumentWidget->setObjectName( QString::fromUtf8( "kcfg_CustomArgument" ) );
  *     widget->addRow( "Custom argument", customArgumentWidget );
  *
diff --git a/okular/part.cpp b/okular/part.cpp
index 63a3375e..27d5a90b 100644
--- a/okular/part.cpp
+++ b/okular/part.cpp
@@ -1871,10 +1871,11 @@ class GotoPageDialog : public KDialog
             QVBoxLayout *topLayout = new QVBoxLayout(w);
             topLayout->setMargin(0);
             topLayout->setSpacing(spacingHint());
-            e1 = new KIntNumInput(current, w);
+            e1 = new KIntNumInput(w);
             e1->setRange(1, max);
-            e1->setEditFocus(true);
+            e1->setValue(current);
             e1->setSliderEnabled(true);
+            e1->setFocus();
 
             QLabel *label = new QLabel(i18n("&Page:"), w);
             label->setBuddy(e1);