diff --git a/android_app/app/src/main/java/com/health/openscale/gui/views/MeasurementView.java b/android_app/app/src/main/java/com/health/openscale/gui/views/MeasurementView.java
index d61af4f8..3005c0b1 100644
--- a/android_app/app/src/main/java/com/health/openscale/gui/views/MeasurementView.java
+++ b/android_app/app/src/main/java/com/health/openscale/gui/views/MeasurementView.java
@@ -413,7 +413,7 @@ public abstract class MeasurementView extends TableLayout {
         ViewGroup parent = (ViewGroup) getParent();
         for (int i = parent.indexOfChild(this) + 1; i < parent.getChildCount(); ++i) {
             MeasurementView next = (MeasurementView) parent.getChildAt(i);
-            if (next.isEditable()) {
+            if (next.isVisible() && next.isEditable()) {
                 return next;
             }
         }