diff --git a/src/gui/advancedsettings.cpp b/src/gui/advancedsettings.cpp
index 93d757a10..18a84cf63 100644
--- a/src/gui/advancedsettings.cpp
+++ b/src/gui/advancedsettings.cpp
@@ -82,6 +82,9 @@ namespace
         DOWNLOAD_TRACKER_FAVICON,
         SAVE_PATH_HISTORY_LENGTH,
         ENABLE_SPEED_WIDGET,
+        // embedded tracker
+        TRACKER_STATUS,
+        TRACKER_PORT,
         // libtorrent section
         LIBTORRENT_HEADER,
         ASYNC_IO_THREADS,
@@ -119,9 +122,6 @@ namespace
         VALIDATE_HTTPS_TRACKER_CERTIFICATE,
 #endif
         BLOCK_PEERS_ON_PRIVILEGED_PORTS,
-        // embedded tracker
-        TRACKER_STATUS,
-        TRACKER_PORT,
         // seeding
         CHOKING_ALGORITHM,
         SEED_CHOKING_ALGORITHM,
diff --git a/src/webui/www/private/views/preferences.html b/src/webui/www/private/views/preferences.html
index e127e21aa..76ece65fa 100644
--- a/src/webui/www/private/views/preferences.html
+++ b/src/webui/www/private/views/preferences.html
@@ -931,6 +931,22 @@
                     <input type="checkbox" id="resolvePeerCountries">
                 </td>
             </tr>
+            <tr>
+                <td>
+                    <label for="enableEmbeddedTracker">QBT_TR(Enable embedded tracker:)QBT_TR[CONTEXT=OptionsDialog]</label>
+                </td>
+                <td>
+                    <input type="checkbox" id="enableEmbeddedTracker" />
+                </td>
+            </tr>
+            <tr>
+                <td>
+                    <label for="embeddedTrackerPort">QBT_TR(Embedded tracker port:)QBT_TR[CONTEXT=OptionsDialog]</label>
+                </td>
+                <td>
+                    <input type="text" id="embeddedTrackerPort" style="width: 15em;" />
+                </td>
+            </tr>
         </table>
     </fieldset>
     <fieldset class="settings">
@@ -1107,22 +1123,6 @@
                     <input type="checkbox" id="blockPeersOnPrivilegedPorts" />
                 </td>
             </tr>
-            <tr>
-                <td>
-                    <label for="enableEmbeddedTracker">QBT_TR(Enable embedded tracker:)QBT_TR[CONTEXT=OptionsDialog]</label>
-                </td>
-                <td>
-                    <input type="checkbox" id="enableEmbeddedTracker" />
-                </td>
-            </tr>
-            <tr>
-                <td>
-                    <label for="embeddedTrackerPort">QBT_TR(Embedded tracker port:)QBT_TR[CONTEXT=OptionsDialog]</label>
-                </td>
-                <td>
-                    <input type="text" id="embeddedTrackerPort" style="width: 15em;" />
-                </td>
-            </tr>
             <tr>
                 <td>
                     <label for="uploadSlotsBehavior">QBT_TR(Upload slots behavior:)QBT_TR[CONTEXT=OptionsDialog]&nbsp;<a href="https://www.libtorrent.org/reference-Settings.html#choking_algorithm" target="_blank">(?)</a></label>