diff --git a/app/src/main/java/eu/faircode/email/StyleHelper.java b/app/src/main/java/eu/faircode/email/StyleHelper.java
index 2a74617daa..f033eb62f1 100644
--- a/app/src/main/java/eu/faircode/email/StyleHelper.java
+++ b/app/src/main/java/eu/faircode/email/StyleHelper.java
@@ -142,6 +142,8 @@ public class StyleHelper {
                                 return setSize(item);
                             } else if (groupId == R.id.group_style_color) {
                                 return setColor(item);
+                            } else if (groupId == R.id.group_style_font) {
+                                return setFont(item);
                             } else if (groupId == R.id.group_style_align) {
                                 return setAlignment(item);
                             } else if (groupId == R.id.group_style_list) {
@@ -150,8 +152,6 @@ public class StyleHelper {
                                     return setListLevel(item);
                                 else
                                     return setList(item);
-                            } else if (groupId == R.id.group_style_font) {
-                                return setFont(item);
                             } else if (groupId == R.id.group_style_blockquote) {
                                 return setBlockQuote(item);
                             } else if (groupId == R.id.group_style_strikethrough) {
diff --git a/app/src/main/res/menu/popup_style.xml b/app/src/main/res/menu/popup_style.xml
index a148d33774..8d10bf7a2f 100644
--- a/app/src/main/res/menu/popup_style.xml
+++ b/app/src/main/res/menu/popup_style.xml
@@ -31,10 +31,20 @@
             android:title="@string/title_style_color" />
     </group>
 
+    <item
+        android:id="@+id/menu_style_font"
+        android:icon="@drawable/twotone_title_24"
+        android:orderInCategory="3"
+        android:title="@string/title_style_font">
+        <menu>
+            <group android:id="@+id/group_style_font" />
+        </menu>
+    </item>
+
     <item
         android:id="@+id/menu_style_align"
         android:icon="@drawable/twotone_format_align_center_24"
-        android:orderInCategory="3"
+        android:orderInCategory="4"
         android:title="@string/title_style_align">
         <menu>
             <group android:id="@+id/group_style_align">
@@ -59,7 +69,7 @@
     <item
         android:id="@+id/menu_style_list"
         android:icon="@drawable/twotone_format_list_bulleted_24"
-        android:orderInCategory="4"
+        android:orderInCategory="5"
         android:title="@string/title_style_list">
         <menu>
             <group android:id="@+id/group_style_list">
@@ -83,16 +93,6 @@
         </menu>
     </item>
 
-    <item
-        android:id="@+id/menu_style_font"
-        android:icon="@drawable/twotone_title_24"
-        android:orderInCategory="5"
-        android:title="@string/title_style_font">
-        <menu>
-            <group android:id="@+id/group_style_font" />
-        </menu>
-    </item>
-
     <group
         android:id="@+id/group_style_blockquote"
         android:orderInCategory="6">