diff --git a/syncplay/ui/GuiConfiguration.py b/syncplay/ui/GuiConfiguration.py
index d8e832a..089a018 100644
--- a/syncplay/ui/GuiConfiguration.py
+++ b/syncplay/ui/GuiConfiguration.py
@@ -976,9 +976,8 @@ class ConfigDialog(QtGui.QDialog):
         self.mainLayout.addWidget(self.tabListFrame, 0, 0, 1, 1)
 
     def ensureTabListIsVisible(self):
-        self.stackedFrame.setFixedWidth(self.stackedFrame.width())
-        while self.tabListWidget.horizontalScrollBar().isVisible() and self.tabListFrame.width() < constants.MAXIMUM_TAB_WIDTH:
-            self.tabListFrame.setFixedWidth(self.tabListFrame.width()+1)
+        leftMargin, topMargin, rightMargin, bottomMargin = self.tabListLayout.getContentsMargins()
+        self.tabListFrame.setFixedWidth(self.tabListWidget.contentsSize().width()+leftMargin+rightMargin+5)
 
     def tabChange(self):
         self.setFocus()