diff --git a/gui/mainwindow.cpp b/gui/mainwindow.cpp
index aafbdc667..46de8fb90 100644
--- a/gui/mainwindow.cpp
+++ b/gui/mainwindow.cpp
@@ -525,7 +525,8 @@ MainWindow::MainWindow(QWidget *parent)
     }
 
     ensurePolished();
-    int edgeWidth=qMax(prevTrackButton->width()*4, (menuButton->width()*2)+volumeSliderSpacer->geometry().width()+volumeSlider->width());
+    int edgeWidth=qMax(prevTrackButton->width()*4, menuButton->sizeHint().width()+songInfoButton->width()+
+                                                   volumeSliderSpacer->sizeHint().width()+volumeSlider->width());
     toolbarSpacerA->setFixedSize(edgeWidth, 0);
     toolbarSpacerB->setFixedSize(edgeWidth, 0);