diff --git a/content/en/docs/workstation/client/wks-batch-registration.md b/content/en/docs/workstation/client/wks-batch-registration.md
index f4ce230028d..c7c7847880e 100644
--- a/content/en/docs/workstation/client/wks-batch-registration.md
+++ b/content/en/docs/workstation/client/wks-batch-registration.md
@@ -2,7 +2,7 @@
 title: "Registering Workstation Clients"
 url: /mendix-workstation/register/
 description: "Describes how to register and pre-configure multiple Workstation Clients."
-weight: 35
+weight: 40
 ---
 
 ## Introduction
diff --git a/content/en/docs/workstation/client/wks-client-autostart.md b/content/en/docs/workstation/client/wks-client-autostart.md
new file mode 100644
index 00000000000..6e67d643e0b
--- /dev/null
+++ b/content/en/docs/workstation/client/wks-client-autostart.md
@@ -0,0 +1,26 @@
+---
+title: "Autostart Configuration for the Workstation Client"
+linktitle: "Autostart Configuration"
+url: /mendix-workstation/autostart-configuration/
+description: "Describes how to disable autostart for the Mendix Workstation Client."
+weight: 50
+---
+
+## Introduction
+
+By default, the Mendix Workstation Client runs automatically after system startup. You can change this behavior by modifying the autostart settings for your operating system.
+
+## Modifying Autostart Settings
+
+After installing the Workstation Client, you can modify its autostart settings by following the usual process for your operating system.
+
+For more information, refer to the documentation of your operating system, such as the following topics:
+
+* Modifying autostart settings in Microsoft Windows - [Configure Startup applications in Windows](https://support.microsoft.com/en-us/windows/experience/startup-boot/configure-startup-applications-in-windows)
+* Modifying login items in MacOS - [Change Login Items & Extensions settings on Mac](https://support.apple.com/guide/mac-help/change-login-items-extensions-settings-mtusr003/mac)
+
+## Stopping the Workstation Client Manually {#stop-client}
+
+The **Close** button closes the Client window but does not terminate the application; it continues to run in the background. To completely quit the Client, right-click its icon in the Windows systray and select **Quit**. This action is only available in [Developer Mode](/mendix-workstation/management-stations/#developer-mode). 
+
+Alternatively, you can stop the Workstation Client process by using Windows Task Manager.
\ No newline at end of file
diff --git a/content/en/docs/workstation/client/wks-client-installation.md b/content/en/docs/workstation/client/wks-client-installation.md
index e04885a9210..8acb380878f 100644
--- a/content/en/docs/workstation/client/wks-client-installation.md
+++ b/content/en/docs/workstation/client/wks-client-installation.md
@@ -101,8 +101,4 @@ To install the Workstation Client on a Linux machine, perform the following step
     sudo capsh --user=$(whoami) --iab="^cap_net_raw" -- -c "'/opt/Mendix Workstation/Mendix Workstation'"
     ```
 
-The Workstation Client runs automatically at system startup. To modify this behavior, see [Stopping the Workstation Client](#stop-client).
-
-### Stopping the Workstation Client {#stop-client}
-
-The **Close** button closes the Client window but does not terminate the application; it continues to run in the background. To completely quit the Client, right-click its icon in the Windows systray and select **Quit**. This action is only available if [Developer Mode](/mendix-workstation/management-stations/#developer-mode) is enabled. Alternatively, the Workstation Client process can always be stopped via Windows Task Manager.
\ No newline at end of file
+The Workstation Client runs automatically at system startup. To modify this behavior, see [Autostart Configuration for the Workstation Client](/mendix-workstation/network-configuration/).
\ No newline at end of file
diff --git a/content/en/docs/workstation/client/wks-client-proxy-settings.md b/content/en/docs/workstation/client/wks-client-proxy-settings.md
index 2251c6ec8e5..b99e3c8c433 100644
--- a/content/en/docs/workstation/client/wks-client-proxy-settings.md
+++ b/content/en/docs/workstation/client/wks-client-proxy-settings.md
@@ -3,7 +3,7 @@ title: "Network Configuration for the Workstation Client"
 linktitle: "Network Configuration"
 url: /mendix-workstation/network-configuration/
 description: "Describes how to configure custom proxy settings for the Workstation Client."
-weight: 30
+weight: 35
 ---
 
 ## Introduction