diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/ButtonPanelView.kt b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/ButtonPanelView.kt
index 312617550..7214a3d12 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/ButtonPanelView.kt
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/ButtonPanelView.kt
@@ -36,12 +36,14 @@ abstract class ButtonPanelView<T : View>(
 
     var buttonCount = 0
         set(value) {
+            if (field == value) return
             field = value
             inflateButtons()
         }
 
     var dataOffset = 0
         set(value) {
+            if (field == value) return
             field = value
             setupButtons()
         }