diff --git a/src/app/calloverlaymodel.cpp b/src/app/calloverlaymodel.cpp
index 6eb8ec5a677a8052f5cc8521158aaf00e95a7440..a6e6134501f4464d22ce2d1b2c5d2b1753911b59 100644
--- a/src/app/calloverlaymodel.cpp
+++ b/src/app/calloverlaymodel.cpp
@@ -357,7 +357,7 @@ CallOverlayModel::eventFilter(QObject* object, QEvent* event)
 void
 CallOverlayModel::setControlRanges()
 {
-    overflowModel_->setRange(0, overflowIndex_ - 1);
+    overflowModel_->setRange(0, overflowIndex_);
     overflowVisibleModel_->setRange(overflowIndex_, secondaryModel_->rowCount());
-    overflowHiddenModel_->setRange(overflowIndex_, secondaryModel_->rowCount());
+    overflowHiddenModel_->setRange(overflowIndex_ + 1, secondaryModel_->rowCount());
 }
diff --git a/src/app/mainview/components/CallActionBar.qml b/src/app/mainview/components/CallActionBar.qml
index 8c6ba02befb48ee751584b7be750553faea4c799..717981b95564a78b38ff9d8cbec1c801a9e8ef61 100644
--- a/src/app/mainview/components/CallActionBar.qml
+++ b/src/app/mainview/components/CallActionBar.qml
@@ -503,14 +503,14 @@ Control {
 
                 property int overflowIndex: {
                     var maxItems = Math.floor(
-                                (overflowRect.remainingSpace - 24) / root.height) - 1
+                                (overflowRect.remainingSpace) / (root.height + itemSpacing)) - 2
                     return Math.min(overflowItemCount, maxItems)
                 }
                 property int nOverflowItems: overflowItemCount - overflowIndex
                 onNOverflowItemsChanged: {
                     var diff = overflowItemListView.count - nOverflowItems
                     var effectiveOverflowIndex = overflowIndex
-                    if (effectiveOverflowIndex === overflowItemCount - 1)
+                    if (effectiveOverflowIndex === overflowItemCount - 2)
                         effectiveOverflowIndex += diff
 
                     CallOverlayModel.overflowIndex = effectiveOverflowIndex
@@ -523,7 +523,7 @@ Control {
             ComboBox {
                 id: overflowButton
 
-                visible: CallOverlayModel.overflowIndex < overflowItemCount
+                visible: CallOverlayModel.overflowIndex < overflowItemCount - 2
                 width: root.height
                 height: width