diff --git a/app/src/main/java/eu/faircode/email/FragmentAccount.java b/app/src/main/java/eu/faircode/email/FragmentAccount.java
index 4b49400dcf..b498af6478 100644
--- a/app/src/main/java/eu/faircode/email/FragmentAccount.java
+++ b/app/src/main/java/eu/faircode/email/FragmentAccount.java
@@ -1054,6 +1054,12 @@ public class FragmentAccount extends FragmentBase {
                             .setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
                                 @Override
                                 public void onClick(DialogInterface dialog, int which) {
+                                    new Handler().post(new Runnable() {
+                                        @Override
+                                        public void run() {
+                                            scroll.smoothScrollTo(0, btnSave.getBottom());
+                                        }
+                                    });
                                     onSave(false);
                                 }
                             })
diff --git a/app/src/main/java/eu/faircode/email/FragmentFolder.java b/app/src/main/java/eu/faircode/email/FragmentFolder.java
index 492c08c84c..949e419021 100644
--- a/app/src/main/java/eu/faircode/email/FragmentFolder.java
+++ b/app/src/main/java/eu/faircode/email/FragmentFolder.java
@@ -24,6 +24,7 @@ import android.content.DialogInterface;
 import android.content.SharedPreferences;
 import android.os.Build;
 import android.os.Bundle;
+import android.os.Handler;
 import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.Menu;
@@ -35,6 +36,7 @@ import android.widget.Button;
 import android.widget.CheckBox;
 import android.widget.CompoundButton;
 import android.widget.EditText;
+import android.widget.ScrollView;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -46,6 +48,8 @@ import java.util.Objects;
 
 public class FragmentFolder extends FragmentBase {
     private ViewGroup view;
+    private ScrollView scroll;
+
     private EditText etName;
     private EditText etDisplay;
     private CheckBox cbHide;
@@ -86,6 +90,7 @@ public class FragmentFolder extends FragmentBase {
         setHasOptionsMenu(true);
 
         view = (ViewGroup) inflater.inflate(R.layout.fragment_folder, container, false);
+        scroll = view.findViewById(R.id.scroll);
 
         // Get controls
         etName = view.findViewById(R.id.etName);
@@ -317,6 +322,12 @@ public class FragmentFolder extends FragmentBase {
                             .setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
                                 @Override
                                 public void onClick(DialogInterface dialog, int which) {
+                                    new Handler().post(new Runnable() {
+                                        @Override
+                                        public void run() {
+                                            scroll.smoothScrollTo(0, btnSave.getBottom());
+                                        }
+                                    });
                                     onSave(false);
                                 }
                             })
diff --git a/app/src/main/java/eu/faircode/email/FragmentIdentity.java b/app/src/main/java/eu/faircode/email/FragmentIdentity.java
index 1d32a4f95d..83b1895423 100644
--- a/app/src/main/java/eu/faircode/email/FragmentIdentity.java
+++ b/app/src/main/java/eu/faircode/email/FragmentIdentity.java
@@ -760,6 +760,12 @@ public class FragmentIdentity extends FragmentBase {
                             .setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
                                 @Override
                                 public void onClick(DialogInterface dialog, int which) {
+                                    new Handler().post(new Runnable() {
+                                        @Override
+                                        public void run() {
+                                            scroll.smoothScrollTo(0, btnSave.getBottom());
+                                        }
+                                    });
                                     onSave(false);
                                 }
                             })
diff --git a/app/src/main/res/layout/fragment_folder.xml b/app/src/main/res/layout/fragment_folder.xml
index c4ae0c8177..14f5150864 100644
--- a/app/src/main/res/layout/fragment_folder.xml
+++ b/app/src/main/res/layout/fragment_folder.xml
@@ -7,6 +7,7 @@
     tools:context=".ActivityView">
 
     <ScrollView
+        android:id="@+id/scroll"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:orientation="vertical"