3 files changed, 26 insertions, 14 deletions
diff --git a/src/selectionmode/bottombar.cpp b/src/selectionmode/bottombar.cpp
index ee63246ca..1c53e6069 100644
--- a/src/selectionmode/bottombar.cpp
+++ b/src/selectionmode/bottombar.cpp
@@ -108,12 +108,13 @@ void BottomBar::resizeEvent(QResizeEvent *resizeEvent)
 {
     if (resizeEvent->oldSize().width() == resizeEvent->size().width()) {
         // The width() didn't change so our custom override isn't needed.
-        return AnimatedHeightWidget::resizeEvent(resizeEvent);
+        AnimatedHeightWidget::resizeEvent(resizeEvent);
+        return;
     }
 
     m_contentsContainer->adaptToNewBarWidth(width());
 
-    return AnimatedHeightWidget::resizeEvent(resizeEvent);
+    AnimatedHeightWidget::resizeEvent(resizeEvent);
 }
 
 int BottomBar::preferredHeight() const
diff --git a/src/selectionmode/bottombarcontentscontainer.cpp b/src/selectionmode/bottombarcontentscontainer.cpp
index c9068138a..14dba3c36 100644
--- a/src/selectionmode/bottombarcontentscontainer.cpp
+++ b/src/selectionmode/bottombarcontentscontainer.cpp
@@ -47,27 +47,38 @@ void BottomBarContentsContainer::resetContents(BottomBar::Contents contents)
     m_contents = contents;
     switch (contents) {
     case BottomBar::CopyContents:
-        return addCopyContents();
+        addCopyContents();
+        break;
     case BottomBar::CopyLocationContents:
-        return addCopyLocationContents();
+        addCopyLocationContents();
+        break;
     case BottomBar::CopyToOtherViewContents:
-        return addCopyToOtherViewContents();
+        addCopyToOtherViewContents();
+        break;
     case BottomBar::CutContents:
-        return addCutContents();
+        addCutContents();
+        break;
     case BottomBar::DeleteContents:
-        return addDeleteContents();
+        addDeleteContents();
+        break;
     case BottomBar::DuplicateContents:
-        return addDuplicateContents();
+        addDuplicateContents();
+        break;
     case BottomBar::GeneralContents:
-        return addGeneralContents();
+        addGeneralContents();
+        break;
     case BottomBar::PasteContents:
-        return addPasteContents();
+        addPasteContents();
+        break;
     case BottomBar::MoveToOtherViewContents:
-        return addMoveToOtherViewContents();
+        addMoveToOtherViewContents();
+        break;
     case BottomBar::MoveToTrashContents:
-        return addMoveToTrashContents();
+        addMoveToTrashContents();
+        break;
     case BottomBar::RenameContents:
-        return addRenameContents();
+        addRenameContents();
+        break;
     }
 }
 
diff --git a/src/selectionmode/topbar.cpp b/src/selectionmode/topbar.cpp
index 7ef507910..07ac6b4e3 100644
--- a/src/selectionmode/topbar.cpp
+++ b/src/selectionmode/topbar.cpp
@@ -70,7 +70,7 @@ TopBar::TopBar(QWidget *parent)
 void TopBar::resizeEvent(QResizeEvent *resizeEvent)
 {
     updateLabelString();
-    return AnimatedHeightWidget::resizeEvent(resizeEvent);
+    AnimatedHeightWidget::resizeEvent(resizeEvent);
 }
 
 void TopBar::updateLabelString()