1 files changed, 10 insertions, 2 deletions
diff --git a/src/libs/advanceddockingsystem/dockwidget.cpp b/src/libs/advanceddockingsystem/dockwidget.cpp
index 9c9e6086cd..f216ac7495 100644
--- a/src/libs/advanceddockingsystem/dockwidget.cpp
+++ b/src/libs/advanceddockingsystem/dockwidget.cpp
@@ -309,8 +309,11 @@ void DockWidget::setWidget(QWidget *widget, eInsertMode insertMode)
     auto scrollAreaWidget = qobject_cast<QAbstractScrollArea *>(widget);
     if (scrollAreaWidget || ForceNoScrollArea == insertMode) {
         d->m_layout->addWidget(widget);
-        if (scrollAreaWidget && scrollAreaWidget->viewport())
-            scrollAreaWidget->viewport()->setProperty("dockWidgetContent", true);
+        if (scrollAreaWidget) {
+            if (scrollAreaWidget->viewport())
+                scrollAreaWidget->viewport()->setProperty("dockWidgetContent", true);
+            scrollAreaWidget->setProperty("focused", isFocused());
+        }
     } else {
         d->setupScrollArea();
         d->m_scrollArea->setWidget(widget);
@@ -482,6 +485,11 @@ void DockWidget::setFocused(bool focused)
     if (d->m_scrollArea)
         d->m_scrollArea->setProperty("focused", focused);
 
+    QList<QAbstractScrollArea *> scrollAreas = d->m_widget->findChildren<QAbstractScrollArea *>(
+        Qt::FindDirectChildrenOnly);
+    for (QAbstractScrollArea *scrollArea : scrollAreas)
+        scrollArea->setProperty("focused", focused);
+
     const QString customObjectName = QString("__mainSrollView");
 
     QList<QQuickWidget *> quickWidgets = d->m_widget->findChildren<QQuickWidget *>();