diff --git a/src/blackgui/components/aircraftcomponent.cpp b/src/blackgui/components/aircraftcomponent.cpp
index fb1282cc9..f9029b6ab 100644
--- a/src/blackgui/components/aircraftcomponent.cpp
+++ b/src/blackgui/components/aircraftcomponent.cpp
@@ -44,6 +44,7 @@ namespace BlackGui
         {
             ui->setupUi(this);
             this->tabBar()->setExpanding(false);
+            this->tabBar()->setUsesScrollButtons(true);
             this->ui->tvp_AirportsInRange->setResizeMode(CAirportView::ResizingOnce);
 
             this->ui->tvp_AircraftInRange->setAircraftMode(CSimulatedAircraftListModel::InfoMode);
diff --git a/src/blackgui/components/atcstationcomponent.cpp b/src/blackgui/components/atcstationcomponent.cpp
index a504a143b..8ebd41149 100644
--- a/src/blackgui/components/atcstationcomponent.cpp
+++ b/src/blackgui/components/atcstationcomponent.cpp
@@ -57,6 +57,7 @@ namespace BlackGui
         {
             ui->setupUi(this);
             this->tabBar()->setExpanding(false);
+            this->tabBar()->setUsesScrollButtons(true);
 
             // some icons
             this->ui->pb_AtcStationsAtisReload->setIcon(CIcons::atis());
diff --git a/src/blackgui/components/flightplancomponent.cpp b/src/blackgui/components/flightplancomponent.cpp
index 1b68b31a9..1018e512d 100644
--- a/src/blackgui/components/flightplancomponent.cpp
+++ b/src/blackgui/components/flightplancomponent.cpp
@@ -65,6 +65,7 @@ namespace BlackGui
 
             // fix style
             this->tabBar()->setExpanding(false);
+            this->tabBar()->setUsesScrollButtons(true);
 
             // validators
             CUpperCaseValidator *ucv = new CUpperCaseValidator(this);
diff --git a/src/blackgui/components/mappingcomponent.cpp b/src/blackgui/components/mappingcomponent.cpp
index 3ccb7dae3..329f0637e 100644
--- a/src/blackgui/components/mappingcomponent.cpp
+++ b/src/blackgui/components/mappingcomponent.cpp
@@ -38,8 +38,6 @@
 #include <QPixmap>
 #include <QPushButton>
 #include <QStringListModel>
-#include <QTabBar>
-#include <QTabWidget>
 #include <QtGlobal>
 
 using namespace BlackMisc;
diff --git a/src/blackgui/components/settingscomponent.cpp b/src/blackgui/components/settingscomponent.cpp
index dd637d41f..67cb3818f 100644
--- a/src/blackgui/components/settingscomponent.cpp
+++ b/src/blackgui/components/settingscomponent.cpp
@@ -44,6 +44,7 @@ namespace BlackGui
         {
             ui->setupUi(this);
             this->tabBar()->setExpanding(false);
+            this->tabBar()->setUsesScrollButtons(true);
 
             // Opacity, intervals
             this->connect(this->ui->hs_SettingsGuiOpacity, &QSlider::valueChanged, this, &CSettingsComponent::changedWindowsOpacity);
diff --git a/src/blackgui/components/usercomponent.cpp b/src/blackgui/components/usercomponent.cpp
index 63acfbeb2..8fb3722ca 100644
--- a/src/blackgui/components/usercomponent.cpp
+++ b/src/blackgui/components/usercomponent.cpp
@@ -36,6 +36,7 @@ namespace BlackGui
         {
             ui->setupUi(this);
             this->tabBar()->setExpanding(false);
+            this->tabBar()->setUsesScrollButtons(true);
             connect(this->ui->tvp_AllUsers, &CUserView::modelDataChanged, this, &CUserComponent::ps_onCountChanged);
             connect(this->ui->tvp_Clients, &CClientView::modelDataChanged, this, &CUserComponent::ps_onCountChanged);
             connect(sGui->getIContextNetwork(), &IContextNetwork::connectionStatusChanged, this, &CUserComponent::ps_connectionStatusChanged);
diff --git a/src/blackgui/infoarea.cpp b/src/blackgui/infoarea.cpp
index e84fe9578..e630ed865 100644
--- a/src/blackgui/infoarea.cpp
+++ b/src/blackgui/infoarea.cpp
@@ -537,6 +537,7 @@ namespace BlackGui
                 this->m_tabBar->setObjectName("comp_MainInfoAreaDockWidgetTab");
                 this->m_tabBar->setMovable(false);
                 this->m_tabBar->setElideMode(Qt::ElideNone);
+                this->m_tabBar->setUsesScrollButtons(true);
 
                 // East / West does not work (shown, but area itself empty)
                 // South does not have any effect