diff --git a/app/savebar.cpp b/app/savebar.cpp
--- a/app/savebar.cpp
+++ b/app/savebar.cpp
@@ -208,6 +208,7 @@
         mSaveAllButton->setVisible(lst.size() >= 1);
 
         mMessageLabel->setText(message);
+        mMessageLabel->setMaximumWidth(mMessageLabel->minimumSizeHint().width());
         mActionsLabel->setText(links.join(" | "));
     }
 
@@ -236,7 +237,7 @@
     d->applyNormalStyleSheet();
 
     d->mMessageLabel = new QLabel;
-    d->mMessageLabel->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Fixed);
+    d->mMessageLabel->setSizePolicy(QSizePolicy::Ignored, QSizePolicy::Fixed);
 
     d->mUndoButton = createToolButton();
     d->mRedoButton = createToolButton();
@@ -246,14 +247,15 @@
 
     d->mActionsLabel = new QLabel;
     d->mActionsLabel->setAlignment(Qt::AlignCenter);
-    d->mActionsLabel->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
+    d->mActionsLabel->setSizePolicy(QSizePolicy::Ignored, QSizePolicy::Fixed);
 
     d->createTooManyChangesFrame();
 
     // Setup top row
     d->mTopRowWidget = new QWidget;
     QHBoxLayout* rowLayout = new QHBoxLayout(d->mTopRowWidget);
     rowLayout->addWidget(d->mMessageLabel);
+    rowLayout->setStretchFactor(d->mMessageLabel, 1);
     rowLayout->addWidget(d->mUndoButton);
     rowLayout->addWidget(d->mRedoButton);
     rowLayout->addWidget(d->mActionsLabel);
diff --git a/lib/slidecontainer.cpp b/lib/slidecontainer.cpp
--- a/lib/slidecontainer.cpp
+++ b/lib/slidecontainer.cpp
@@ -128,10 +128,17 @@
 
 bool SlideContainer::eventFilter(QObject*, QEvent* event)
 {
-    if (event->type() == QEvent::Resize) {
+    switch (event->type()) {
+    case QEvent::Resize:
         if (!mSlidingOut && height() != 0) {
             animTo(mContent->height());
         }
+        break;
+    case QEvent::LayoutRequest:
+        updateGeometry();
+        break;
+    default:
+        break;
     }
     return false;
 }