diff --git a/app/src/main/java/eu/faircode/email/ActivityWidgetUnified.java b/app/src/main/java/eu/faircode/email/ActivityWidgetUnified.java
index cfb64500aa..23c8ddc4b4 100644
--- a/app/src/main/java/eu/faircode/email/ActivityWidgetUnified.java
+++ b/app/src/main/java/eu/faircode/email/ActivityWidgetUnified.java
@@ -270,17 +270,17 @@ public class ActivityWidgetUnified extends ActivityBase {
                 SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(ActivityWidgetUnified.this);
                 SharedPreferences.Editor editor = prefs.edit();
 
-                if (account != null && account.id > 0) {
-                    String name = etName.getText().toString();
-                    if (TextUtils.isEmpty(name))
+                String name = etName.getText().toString();
+                if (TextUtils.isEmpty(name))
+                    if (account != null && account.id > 0)
                         if (folder != null && folder.id > 0)
                             editor.putString("widget." + appWidgetId + ".name", folder.getDisplayName(ActivityWidgetUnified.this));
                         else
                             editor.putString("widget." + appWidgetId + ".name", account.name);
                     else
-                        editor.putString("widget." + appWidgetId + ".name", name);
-                } else
-                    editor.remove("widget." + appWidgetId + ".name");
+                        editor.remove("widget." + appWidgetId + ".name");
+                else
+                    editor.putString("widget." + appWidgetId + ".name", name);
 
                 int font = spFontSize.getSelectedItemPosition();
                 int padding = spPadding.getSelectedItemPosition();