diff --git a/app/src/main/java/eu/faircode/email/ActivitySignature.java b/app/src/main/java/eu/faircode/email/ActivitySignature.java
index af011f086b..a3492db096 100644
--- a/app/src/main/java/eu/faircode/email/ActivitySignature.java
+++ b/app/src/main/java/eu/faircode/email/ActivitySignature.java
@@ -62,9 +62,6 @@ public class ActivitySignature extends ActivityBase {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
-        if (savedInstanceState != null)
-            etText.setRaw(savedInstanceState.getBoolean("fair:raw"));
-
         getSupportActionBar().setSubtitle(getString(R.string.title_edit_signature));
 
         LayoutInflater inflater = LayoutInflater.from(this);
@@ -125,6 +122,9 @@ public class ActivitySignature extends ActivityBase {
             }
         });
 
+        if (savedInstanceState != null)
+            etText.setRaw(savedInstanceState.getBoolean("fair:raw"));
+
         style_bar.setVisibility(View.GONE);
 
         setResult(RESULT_CANCELED, new Intent());