diff --git a/src/widgets/fancytabwidget.cpp b/src/widgets/fancytabwidget.cpp
index 3e7d06480..d5abb2127 100644
--- a/src/widgets/fancytabwidget.cpp
+++ b/src/widgets/fancytabwidget.cpp
@@ -630,6 +630,8 @@ void FancyTabWidget::SetMode(Mode mode) {
       break;
   }
 
+  tab_bar_->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred);
+
   mode_ = mode;
   emit ModeChanged(mode);
   update();
@@ -670,6 +672,7 @@ void FancyTabWidget::MakeTabBar(QTabBar::Shape shape, bool text, bool icons,
   QTabBar* bar = new QTabBar(this);
   bar->setShape(shape);
   bar->setDocumentMode(true);
+  bar->setUsesScrollButtons(true);
 
   if (shape == QTabBar::RoundedWest) {
     bar->setIconSize(QSize(22, 22));