diff --git a/src/controls/SpinBox.qml b/src/controls/SpinBox.qml
index 4b6d4e851487fe5b92e64da9c7ad51320c97ceb8..c82e3410f7201b7c2210d2770b205dd3f78d991d 100644
--- a/src/controls/SpinBox.qml
+++ b/src/controls/SpinBox.qml
@@ -152,6 +152,8 @@ Control {
         input.text =  value.toFixed(decimals)
     }
 
+    /*! \internal */
+    property bool __initialized: false
     /*! \internal */
     readonly property bool __upEnabled: value != maximumValue;
     /*! \internal */
@@ -196,9 +198,13 @@ Control {
     /*! \internal */
     onMinimumValueChanged: input.setValue(value)
     /*! \internal */
-    Component.onCompleted: input.setValue(value)
+    Component.onCompleted: {
+        __initialized = true;
+        input.setValue(value)
+    }
+
     /*! \internal */
-    onValueChanged: input.setValue(value)
+    onValueChanged: if (__initialized) input.setValue(value)
 
     Accessible.name: input.text
     Accessible.role: Accessible.SpinBox
diff --git a/tests/auto/controls/data/tst_spinbox.qml b/tests/auto/controls/data/tst_spinbox.qml
index e3105384f814bc154bd7af6148324d6758cd8277..b725b88a0e08ce1dbd6e3f12b0f9b17962bd56f6 100644
--- a/tests/auto/controls/data/tst_spinbox.qml
+++ b/tests/auto/controls/data/tst_spinbox.qml
@@ -255,6 +255,18 @@ Item {
             compare(spinbox.value, spinbox.maximumValue)
         }
 
+        function test_initialization_order()
+        {
+            var spinbox = Qt.createQmlObject("import QtQuick.Controls 1.0; SpinBox { id: spinbox;"  +
+                                             "maximumValue: 2000; value: 1000; implicitWidth:80}",
+                                             container, '')
+            compare(spinbox.value, 1000);
+
+            spinbox = Qt.createQmlObject('import QtQuick.Controls 1.0; SpinBox { minimumValue: -1000 ; value:-1000}',
+                                             container, '')
+            compare(spinbox.value, -1000);
+        }
+
         function test_ImplicitSize() // Verify if we correctly grow and shrink depending on contents
         {
             var spinbox = Qt.createQmlObject('import QtQuick.Controls 1.0; SpinBox {}', container, '')