diff --git a/src/plugins/texteditor/texteditor.cpp b/src/plugins/texteditor/texteditor.cpp
index 5325e973ba4..44318208613 100644
--- a/src/plugins/texteditor/texteditor.cpp
+++ b/src/plugins/texteditor/texteditor.cpp
@@ -3370,7 +3370,8 @@ void TextEditorWidget::resizeEvent(QResizeEvent *e)
     QRect cr = rect();
     d->m_extraArea->setGeometry(
         QStyle::visualRect(layoutDirection(), cr,
-                           QRect(cr.left(), cr.top(), extraAreaWidth(), cr.height())));
+                           QRect(cr.left() + frameWidth(), cr.top() + frameWidth(),
+                                 extraAreaWidth(), cr.height() - 2 * frameWidth())));
     d->adjustScrollBarRanges();
     d->updateCurrentLineInScrollbar();
 }
@@ -4649,6 +4650,9 @@ int TextEditorWidget::extraAreaWidth(int *markWidthPtr) const
     if (!d->m_marksVisible && documentLayout->hasMarks)
         d->m_marksVisible = true;
 
+    if (!d->m_marksVisible && !d->m_lineNumbersVisible && !d->m_codeFoldingVisible)
+        return 0;
+
     int space = 0;
     const QFontMetrics fm(d->m_extraArea->fontMetrics());
 
diff --git a/src/plugins/welcome/welcomeplugin.cpp b/src/plugins/welcome/welcomeplugin.cpp
index d22d398334a..123cbf04377 100644
--- a/src/plugins/welcome/welcomeplugin.cpp
+++ b/src/plugins/welcome/welcomeplugin.cpp
@@ -52,6 +52,7 @@
 #include <QMouseEvent>
 #include <QOpenGLWidget>
 #include <QPainter>
+#include <QScrollArea>
 #include <QStackedWidget>
 #include <QTimer>
 #include <QVBoxLayout>
@@ -292,6 +293,11 @@ WelcomeMode::WelcomeMode()
     m_modeWidget->setPalette(palette);
 
     m_sideBar = new SideBar(m_modeWidget);
+    auto scrollableSideBar = new QScrollArea(m_modeWidget);
+    scrollableSideBar->setWidget(m_sideBar);
+    scrollableSideBar->setWidgetResizable(true);
+    scrollableSideBar->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
+    scrollableSideBar->setFrameShape(QFrame::NoFrame);
 
     auto divider = new QWidget(m_modeWidget);
     divider->setMaximumWidth(1);
@@ -300,10 +306,11 @@ WelcomeMode::WelcomeMode()
     divider->setPalette(themeColor(Theme::Welcome_DividerColor));
 
     m_pageStack = new QStackedWidget(m_modeWidget);
+    m_pageStack->setObjectName("WelcomeScreenStackedWidget");
     m_pageStack->setAutoFillBackground(true);
 
     auto hbox = new QHBoxLayout;
-    hbox->addWidget(m_sideBar);
+    hbox->addWidget(scrollableSideBar);
     hbox->addWidget(divider);
     hbox->addWidget(m_pageStack);
     hbox->setStretchFactor(m_pageStack, 10);
diff --git a/tests/system/shared/welcome.py b/tests/system/shared/welcome.py
index 406f379e030..0d6d446f6b3 100644
--- a/tests/system/shared/welcome.py
+++ b/tests/system/shared/welcome.py
@@ -37,10 +37,8 @@ def getWelcomeScreenSideBarButton(buttonLabel):
     return __getWelcomeScreenButtonHelper__(buttonLabel, sideBar)
 
 def getWelcomeScreenMainButton(buttonLabel):
-    stackedWidget = waitForObject("{type='QWidget' unnamed='1' visible='1' "
-                                  "leftWidget={type='QWidget' unnamed='1' visible='1' "
-                                  "leftWidget={type='Welcome::Internal::SideBar' unnamed='1' "
-                                  "window=':Qt Creator_Core::Internal::MainWindow'}}}")
+    stackedWidget = waitForObject("{type='QStackedWidget' name='WelcomeScreenStackedWidget' "
+                                  "window=':Qt Creator_Core::Internal::MainWindow'}")
     currentStackWidget = stackedWidget.currentWidget()
     return __getWelcomeScreenButtonHelper__(buttonLabel, currentStackWidget)