diff --git a/lib/constants.dart b/lib/constants.dart
index d81306915..a55d1b632 100644
--- a/lib/constants.dart
+++ b/lib/constants.dart
@@ -410,7 +410,6 @@ const List<String> kAdvancedSettings = [
   kSettingsGeneratedNumbers,
   kSettingsInvoiceDesign,
   kSettingsTemplatesAndReminders,
-  kSettingsWorkflowSettings,
   kSettingsSubscriptions,
   kSettingsUserManagement,
 ];
diff --git a/lib/ui/settings/settings_list.dart b/lib/ui/settings/settings_list.dart
index d63c9ef2a..6726a0153 100644
--- a/lib/ui/settings/settings_list.dart
+++ b/lib/ui/settings/settings_list.dart
@@ -140,6 +140,10 @@ class _SettingsListState extends State<SettingsList> {
                 section: kSettingsExpenses,
                 viewModel: widget.viewModel,
               ),
+            SettingsListTile(
+              section: kSettingsWorkflowSettings,
+              viewModel: widget.viewModel,
+            ),
             // TODO Re-entable
             /*
               if (showAll)
@@ -205,10 +209,6 @@ class _SettingsListState extends State<SettingsList> {
               section: kSettingsSubscriptions,
               viewModel: widget.viewModel,
             ),
-            SettingsListTile(
-              section: kSettingsWorkflowSettings,
-              viewModel: widget.viewModel,
-            ),
             /*
               if (showAll)
                 SettingsListTile(
@@ -417,6 +417,16 @@ class SettingsSearch extends StatelessWidget {
           'expense_categories',
         ],
       ],
+      kSettingsWorkflowSettings: [
+        [
+          'auto_email_invoice',
+          'auto_archive_invoice',
+          'lock_invoices',
+        ],
+        [
+          'auto_convert',
+        ],
+      ],
       kSettingsImportExport: [
         [
           'import',
@@ -546,16 +556,6 @@ class SettingsSearch extends StatelessWidget {
           'subscriptions',
         ],
       ],
-      kSettingsWorkflowSettings: [
-        [
-          'auto_email_invoice',
-          'auto_archive_invoice',
-          'lock_invoices',
-        ],
-        [
-          'auto_convert',
-        ],
-      ],
       kSettingsUserManagement: [
         [
           'users',