diff --git a/frontend/src/components/SettingsModal.tsx b/frontend/src/components/SettingsModal.tsx
index 3059946..5d46141 100644
--- a/frontend/src/components/SettingsModal.tsx
+++ b/frontend/src/components/SettingsModal.tsx
@@ -217,20 +217,6 @@ export function SettingsModal(props: SettingsModalProps) {
         </div>
       )}
 
-      {shouldRenderSection('mqtt') && (
-        <div className={sectionWrapperClass}>
-          {renderSectionHeader('mqtt')}
-          {isSectionVisible('mqtt') && appSettings && (
-            <SettingsMqttSection
-              appSettings={appSettings}
-              health={health}
-              onSaveAppSettings={onSaveAppSettings}
-              className={sectionContentClass}
-            />
-          )}
-        </div>
-      )}
-
       {shouldRenderSection('database') && (
         <div className={sectionWrapperClass}>
           {renderSectionHeader('database')}
@@ -261,6 +247,20 @@ export function SettingsModal(props: SettingsModalProps) {
         </div>
       )}
 
+      {shouldRenderSection('mqtt') && (
+        <div className={sectionWrapperClass}>
+          {renderSectionHeader('mqtt')}
+          {isSectionVisible('mqtt') && appSettings && (
+            <SettingsMqttSection
+              appSettings={appSettings}
+              health={health}
+              onSaveAppSettings={onSaveAppSettings}
+              className={sectionContentClass}
+            />
+          )}
+        </div>
+      )}
+
       {shouldRenderSection('statistics') && (
         <div className={sectionWrapperClass}>
           {renderSectionHeader('statistics')}
diff --git a/frontend/src/components/settings/settingsConstants.ts b/frontend/src/components/settings/settingsConstants.ts
index 8fe66c4..6cbcaef 100644
--- a/frontend/src/components/settings/settingsConstants.ts
+++ b/frontend/src/components/settings/settingsConstants.ts
@@ -12,9 +12,9 @@ export const SETTINGS_SECTION_ORDER: SettingsSection[] = [
   'radio',
   'identity',
   'connectivity',
-  'mqtt',
   'database',
   'bot',
+  'mqtt',
   'statistics',
   'about',
 ];
@@ -23,9 +23,9 @@ export const SETTINGS_SECTION_LABELS: Record<SettingsSection, string> = {
   radio: '📻 Radio',
   identity: '🪪 Identity',
   connectivity: '📡 Connectivity',
-  mqtt: '📤 MQTT',
   database: '🗄️ Database & Interface',
-  bot: '🤖 Bot',
+  bot: '🤖 Bots',
+  mqtt: '📤 MQTT',
   statistics: '📊 Statistics',
   about: 'About',
 };