diff --git a/android_app/app/src/main/java/com/health/openscale/gui/views/FatMeasurementView.java b/android_app/app/src/main/java/com/health/openscale/gui/views/FatMeasurementView.java
index 52a4ba6b..b32c37a0 100644
--- a/android_app/app/src/main/java/com/health/openscale/gui/views/FatMeasurementView.java
+++ b/android_app/app/src/main/java/com/health/openscale/gui/views/FatMeasurementView.java
@@ -62,7 +62,7 @@ public class FatMeasurementView extends MeasurementView {
 
     @Override
     public float getMaxValue() {
-        return 40;
+        return 80;
     }
 
 }
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 4857b352..0a765fd8 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
@@ -312,6 +312,8 @@ public abstract class MeasurementView extends TableLayout {
 
         input.setInputType(getInputType());
         input.setHint(getHintText());
+        input.setText(value);
+        input.setSelection(value.length());
         builder.setView(input);
 
         builder.setPositiveButton(getResources().getString(R.string.label_ok), null);