diff --git a/src/capture/widget/buttonhandler.cpp b/src/capture/widget/buttonhandler.cpp
index e67e8c0b..fd087971 100644
--- a/src/capture/widget/buttonhandler.cpp
+++ b/src/capture/widget/buttonhandler.cpp
@@ -263,7 +263,7 @@ void ButtonHandler::positionButtonsInside(int index) {
     for (; index < m_vectorButtons.size(); ++index) {
         button = m_vectorButtons[index];
         button->move(xPos, yPos);
-        if (button->pos().x() + m_buttonExtendedSize) {
+        if (button->pos().x() + m_buttonExtendedSize > m_limits.right()) {
             xPos = m_selection.left() + SEPARATION;
             yPos -= (m_buttonExtendedSize);
         }