diff --git a/app/src/main/java/eu/faircode/email/ActivityView.java b/app/src/main/java/eu/faircode/email/ActivityView.java
index fddbb09fd0..414b4441bf 100644
--- a/app/src/main/java/eu/faircode/email/ActivityView.java
+++ b/app/src/main/java/eu/faircode/email/ActivityView.java
@@ -329,8 +329,11 @@ public class ActivityView extends ActivityBase implements FragmentManager.OnBack
         int count = getSupportFragmentManager().getBackStackEntryCount();
         if (count == 0)
             finish();
-        else
+        else {
+            if (drawerLayout.isDrawerOpen(drawerList))
+                drawerLayout.closeDrawer(drawerList);
             drawerToggle.setDrawerIndicatorEnabled(count == 1);
+        }
     }
 
     @Override