diff --git a/app/src/main/java/eu/faircode/email/FragmentFolders.java b/app/src/main/java/eu/faircode/email/FragmentFolders.java
index d83dd7bc60..ea756a9c5e 100644
--- a/app/src/main/java/eu/faircode/email/FragmentFolders.java
+++ b/app/src/main/java/eu/faircode/email/FragmentFolders.java
@@ -640,8 +640,8 @@ public class FragmentFolders extends FragmentBase {
         boolean sort_unread_atop = prefs.getBoolean("sort_unread_atop", false);
 
         menu.findItem(R.id.menu_unified).setVisible(account < 0 || primary);
-        menu.findItem(R.id.menu_theme).setVisible(account < 0 || primary);
         menu.findItem(R.id.menu_compact).setChecked(compact);
+        menu.findItem(R.id.menu_theme).setVisible(account < 0 || primary);
         menu.findItem(R.id.menu_show_hidden).setChecked(show_hidden);
         menu.findItem(R.id.menu_show_flagged).setChecked(show_flagged);
         menu.findItem(R.id.menu_subscribed_only).setChecked(subscribed_only);
@@ -662,12 +662,12 @@ public class FragmentFolders extends FragmentBase {
         } else if (itemId == R.id.menu_unified) {
             onMenuUnified();
             return true;
-        } else if (itemId == R.id.menu_theme) {
-            onMenuTheme();
-            return true;
         } else if (itemId == R.id.menu_compact) {
             onMenuCompact();
             return true;
+        } else if (itemId == R.id.menu_theme) {
+            onMenuTheme();
+            return true;
         } else if (itemId == R.id.menu_show_hidden) {
             onMenuShowHidden();
             return true;
@@ -714,10 +714,6 @@ public class FragmentFolders extends FragmentBase {
         fragmentTransaction.commit();
     }
 
-    private void onMenuTheme() {
-        new FragmentDialogTheme().show(getParentFragmentManager(), "messages:theme");
-    }
-
     private void onMenuCompact() {
         compact = !compact;
 
@@ -738,6 +734,10 @@ public class FragmentFolders extends FragmentBase {
         });
     }
 
+    private void onMenuTheme() {
+        new FragmentDialogTheme().show(getParentFragmentManager(), "messages:theme");
+    }
+
     private void onMenuShowHidden() {
         show_hidden = !show_hidden;
 
diff --git a/app/src/main/res/menu/menu_folders.xml b/app/src/main/res/menu/menu_folders.xml
index 34f581234c..d5d8e4346d 100644
--- a/app/src/main/res/menu/menu_folders.xml
+++ b/app/src/main/res/menu/menu_folders.xml
@@ -15,18 +15,18 @@
         app:showAsAction="always" />
 
     <group android:id="@+id/group_appearance">
+        <item
+            android:id="@+id/menu_compact"
+            android:checkable="true"
+            android:title="@string/title_compact"
+            app:showAsAction="never" />
+
         <item
             android:id="@+id/menu_theme"
             android:title="@string/title_setup_theme"
             app:showAsAction="never">
             <menu />
         </item>
-
-        <item
-            android:id="@+id/menu_compact"
-            android:checkable="true"
-            android:title="@string/title_compact"
-            app:showAsAction="never" />
     </group>
 
     <group android:id="@+id/group_options">