diff --git a/app/src/main/java/com/example/assignment1/SettingsActivity.java b/app/src/main/java/com/example/assignment1/SettingsActivity.java
index 2d7342d..ecc75b2 100644
--- a/app/src/main/java/com/example/assignment1/SettingsActivity.java
+++ b/app/src/main/java/com/example/assignment1/SettingsActivity.java
@@ -70,7 +70,8 @@ public class SettingsActivity extends AppCompatActivity {
         if(
                 firstCounterButtonSharedPrefHelper.getCounterButtonName(CounterButton.FIRST) == null ||
                         secondCounterButtonSharedPrefHelper.getCounterButtonName(CounterButton.SECOND) == null ||
-                        thirdCounterButtonSharedPrefHelper.getCounterButtonName(CounterButton.THIRD) == null) {
+                        thirdCounterButtonSharedPrefHelper.getCounterButtonName(CounterButton.THIRD) == null ||
+                        maxCountSharedPrefHelper.getMaxCount() == null) {
 
             goToSettingsActivityEditMode();
 
@@ -116,12 +117,17 @@ public class SettingsActivity extends AppCompatActivity {
 
     protected void goToSettingsActivityEditMode(){
 
+        saveButton.setVisibility(View.VISIBLE);
+
         counter_1_name_edit_text.setEnabled(true);
         counter_2_name_edit_text.setEnabled(true);
         counter_3_name_edit_text.setEnabled(true);
         maximum_counts_edit_text.setEnabled(true);
 
-        saveButton.setVisibility(View.VISIBLE);
+        counter_1_name_edit_text.setText(firstCounterButtonSharedPrefHelper.getCounterButtonName(CounterButton.FIRST));
+        counter_2_name_edit_text.setText(secondCounterButtonSharedPrefHelper.getCounterButtonName(CounterButton.SECOND));
+        counter_3_name_edit_text.setText(thirdCounterButtonSharedPrefHelper.getCounterButtonName(CounterButton.THIRD));
+        maximum_counts_edit_text.setText(maxCountSharedPrefHelper.getMaxCount());
 
         saveButton.setOnClickListener(new View.OnClickListener() {
             @Override