diff --git a/mobile/com.sap.sailing.android.shared/res/layout/edit_set_preference.xml b/mobile/com.sap.sailing.android.shared/res/layout/edit_set_preference.xml
index a54c94781e0..f8b594bf7bd 100644
--- a/mobile/com.sap.sailing.android.shared/res/layout/edit_set_preference.xml
+++ b/mobile/com.sap.sailing.android.shared/res/layout/edit_set_preference.xml
@@ -17,7 +17,7 @@
             android:layout_weight="1"
             android:completionThreshold="1"
             android:hint="@string/enter_new_item"
-            android:inputType="textNoSuggestions|textVisiblePassword" />
+            android:inputType="textCapWords|textNoSuggestions" />
 
         <Button
             android:id="@+id/edit_set_preference_add"
diff --git a/mobile/com.sap.sailing.android.shared/src/com/sap/sailing/android/shared/ui/fragments/preference/EditSetPreferenceDialogFragmentCompat.java b/mobile/com.sap.sailing.android.shared/src/com/sap/sailing/android/shared/ui/fragments/preference/EditSetPreferenceDialogFragmentCompat.java
index e5af588e84a..618094920e4 100644
--- a/mobile/com.sap.sailing.android.shared/src/com/sap/sailing/android/shared/ui/fragments/preference/EditSetPreferenceDialogFragmentCompat.java
+++ b/mobile/com.sap.sailing.android.shared/src/com/sap/sailing/android/shared/ui/fragments/preference/EditSetPreferenceDialogFragmentCompat.java
@@ -96,7 +96,6 @@ public class EditSetPreferenceDialogFragmentCompat extends PreferenceDialogFragm
                 && preference.callChangeListener(values)) {
             ExLog.i(getContext(), TAG, "Storing result...");
             preference.persistStringSet(values);
-            currentValues = values;
         }
     }
 }
diff --git a/mobile/com.sap.sailing.android.shared/src/com/sap/sailing/android/shared/ui/views/EditSetPreference.java b/mobile/com.sap.sailing.android.shared/src/com/sap/sailing/android/shared/ui/views/EditSetPreference.java
index c9ea9d0725b..9fee30128ba 100644
--- a/mobile/com.sap.sailing.android.shared/src/com/sap/sailing/android/shared/ui/views/EditSetPreference.java
+++ b/mobile/com.sap.sailing.android.shared/src/com/sap/sailing/android/shared/ui/views/EditSetPreference.java
@@ -77,4 +77,9 @@ public class EditSetPreference extends DialogPreference {
         return value == null ? null : new HashSet<>(value);
     }
 
+    @Override
+    public boolean persistStringSet(Set<String> values) {
+        currentValues = values;
+        return super.persistStringSet(values);
+    }
 }