diff --git a/app/src/main/java/eu/faircode/email/ActivityView.java b/app/src/main/java/eu/faircode/email/ActivityView.java
index e0751254a7..ce407e4e14 100644
--- a/app/src/main/java/eu/faircode/email/ActivityView.java
+++ b/app/src/main/java/eu/faircode/email/ActivityView.java
@@ -196,6 +196,10 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB
         nav_pinned = getDrawerPinned();
         nav_options = prefs.getBoolean("nav_options", true);
 
+        // Fix imported settings from other device
+        if (nav_expanded && nav_pinned && !canExpandAndPin())
+            nav_pinned = false;
+
         Configuration config = getResources().getConfiguration();
         boolean portrait2 = prefs.getBoolean("portrait2", false);
         boolean portrait2c = prefs.getBoolean("portrait2c", false);