2 files changed, 8 insertions, 1 deletions
diff --git a/src/controls/Private/ScrollViewHelper.qml b/src/controls/Private/ScrollViewHelper.qml
index 530501080..4f1d59f0f 100644
--- a/src/controls/Private/ScrollViewHelper.qml
+++ b/src/controls/Private/ScrollViewHelper.qml
@@ -78,6 +78,8 @@ Item {
             scrollHelper.availableWidth = viewport.width
             scrollHelper.availableHeight = viewport.height
             blockUpdates = false;
+            hscrollbar.valueChanged();
+            vscrollbar.valueChanged();
         }
     }
 
@@ -133,8 +135,11 @@ Item {
         anchors.leftMargin:  leftMargin
         anchors.bottomMargin: bottomMargin
         onScrollAmountChanged: {
+            var scrollableAmount = scrollable ? scrollAmount : 0
             if (flickableItem && (flickableItem.atXBeginning || flickableItem.atXEnd)) {
-                value = flickableItem.contentX - flickableItem.originX
+                value = Math.min(scrollableAmount, flickableItem.contentX - flickableItem.originX);
+            } else if (value > scrollableAmount) {
+                value = scrollableAmount;
             }
         }
         onValueChanged: {
diff --git a/src/dialogs/qquickdialog.cpp b/src/dialogs/qquickdialog.cpp
index ef6a9a1f2..4ccc0f9d7 100644
--- a/src/dialogs/qquickdialog.cpp
+++ b/src/dialogs/qquickdialog.cpp
@@ -322,6 +322,8 @@ void QQuickDialog1::setTitle(const QString &arg)
 {
     if (m_title != arg) {
         m_title = arg;
+        if (m_dialogWindow)
+            m_dialogWindow->setTitle(m_title);
         emit titleChanged();
     }
 }