diff --git a/flutter/lib/common.dart b/flutter/lib/common.dart
index ff88c5647..a9117554d 100644
--- a/flutter/lib/common.dart
+++ b/flutter/lib/common.dart
@@ -1515,7 +1515,8 @@ Future<Offset?> _adjustRestoreMainWindowOffset(
 
 /// Restore window position and size on start
 /// Note that windowId must be provided if it's subwindow
-Future<bool> restoreWindowPosition(WindowType type, {int? windowId, String? peerId}) async {
+Future<bool> restoreWindowPosition(WindowType type,
+    {int? windowId, String? peerId}) async {
   if (bind
       .mainGetEnv(key: "DISABLE_RUSTDESK_RESTORE_WINDOW_POSITION")
       .isNotEmpty) {
@@ -1529,11 +1530,11 @@ Future<bool> restoreWindowPosition(WindowType type, {int? windowId, String? peer
 
   String? pos;
   if (type == WindowType.RemoteDesktop && windowId != null && peerId != null) {
-    pos = await bind.sessionGetFlutterConfigByPeerId(id: peerId, k: kWindowPrefix);
+    pos = await bind.sessionGetFlutterConfigByPeerId(
+        id: peerId, k: kWindowPrefix);
   }
   pos ??= bind.getLocalFlutterConfig(k: kWindowPrefix + type.name);
-  
-  
+
   var lpos = LastWindowPosition.loadFromString(pos);
   if (lpos == null) {
     debugPrint("no window position saved, ignoring position restoration");
@@ -1781,17 +1782,20 @@ List<String>? urlLinkToCmdArgs(Uri uri) {
   return null;
 }
 
-connectMainDesktop(String id,
-    {required bool isFileTransfer,
-    required bool isTcpTunneling,
-    required bool isRDP,
-    bool? forceRelay}) async {
+connectMainDesktop(
+  String id, {
+  required bool isFileTransfer,
+  required bool isTcpTunneling,
+  required bool isRDP,
+  bool? forceRelay,
+  bool forceSeparateWindow = false,
+}) async {
   if (isFileTransfer) {
     await rustDeskWinManager.newFileTransfer(id, forceRelay: forceRelay);
   } else if (isTcpTunneling || isRDP) {
     await rustDeskWinManager.newPortForward(id, isRDP, forceRelay: forceRelay);
   } else {
-    await rustDeskWinManager.newRemoteDesktop(id, forceRelay: forceRelay);
+    await rustDeskWinManager.newRemoteDesktop(id, forceRelay: forceRelay, forceSeparateWindow: forceSeparateWindow);
   }
 }
 
@@ -1799,10 +1803,14 @@ connectMainDesktop(String id,
 /// If [isFileTransfer], starts a session only for file transfer.
 /// If [isTcpTunneling], starts a session only for tcp tunneling.
 /// If [isRDP], starts a session only for rdp.
-connect(BuildContext context, String id,
-    {bool isFileTransfer = false,
-    bool isTcpTunneling = false,
-    bool isRDP = false}) async {
+connect(
+  BuildContext context,
+  String id, {
+  bool isFileTransfer = false,
+  bool isTcpTunneling = false,
+  bool isRDP = false,
+  bool forceSeparateWindow = false,
+}) async {
   if (id == '') return;
   id = id.replaceAll(' ', '');
   final oldId = id;
@@ -1813,18 +1821,22 @@ connect(BuildContext context, String id,
 
   if (isDesktop) {
     if (desktopType == DesktopType.main) {
-      await connectMainDesktop(id,
-          isFileTransfer: isFileTransfer,
-          isTcpTunneling: isTcpTunneling,
-          isRDP: isRDP,
-          forceRelay: forceRelay);
+      await connectMainDesktop(
+        id,
+        isFileTransfer: isFileTransfer,
+        isTcpTunneling: isTcpTunneling,
+        isRDP: isRDP,
+        forceRelay: forceRelay,
+        forceSeparateWindow: forceSeparateWindow,
+      );
     } else {
       await rustDeskWinManager.call(WindowType.Main, kWindowConnect, {
         'id': id,
         'isFileTransfer': isFileTransfer,
         'isTcpTunneling': isTcpTunneling,
         'isRDP': isRDP,
-        "forceRelay": forceRelay,
+        'forceRelay': forceRelay,
+        'forceSeparateWindow': forceSeparateWindow,
       });
     }
   } else {
diff --git a/flutter/lib/common/widgets/peer_card.dart b/flutter/lib/common/widgets/peer_card.dart
index 44178bd5d..4e03edfbd 100644
--- a/flutter/lib/common/widgets/peer_card.dart
+++ b/flutter/lib/common/widgets/peer_card.dart
@@ -399,10 +399,14 @@ abstract class BasePeerCard extends StatelessWidget {
   Future<List<MenuEntryBase<String>>> _buildMenuItems(BuildContext context);
 
   MenuEntryBase<String> _connectCommonAction(
-      BuildContext context, String id, String title,
-      {bool isFileTransfer = false,
-      bool isTcpTunneling = false,
-      bool isRDP = false}) {
+    BuildContext context,
+    String id,
+    String title, {
+    bool isFileTransfer = false,
+    bool isTcpTunneling = false,
+    bool isRDP = false,
+    bool forceSeparateWindow = false,
+  }) {
     return MenuEntryButton<String>(
       childBuilder: (TextStyle? style) => Text(
         title,
@@ -415,6 +419,7 @@ abstract class BasePeerCard extends StatelessWidget {
           isFileTransfer: isFileTransfer,
           isTcpTunneling: isTcpTunneling,
           isRDP: isRDP,
+          forceSeparateWindow: forceSeparateWindow,
         );
       },
       padding: menuPadding,
@@ -423,13 +428,26 @@ abstract class BasePeerCard extends StatelessWidget {
   }
 
   @protected
-  MenuEntryBase<String> _connectAction(BuildContext context, Peer peer) {
+  List<MenuEntryBase<String>> _connectActions(BuildContext context, Peer peer) {
+    final actions = [_connectAction(context, peer, false)];
+    if (!mainGetLocalBoolOptionSync(kOptionSeparateRemoteWindow)) {
+      actions.add(_connectAction(context, peer, true));
+    }
+    return actions;
+  }
+
+  @protected
+  MenuEntryBase<String> _connectAction(
+      BuildContext context, Peer peer, bool forceSeparateWindow) {
     return _connectCommonAction(
-        context,
-        peer.id,
-        peer.alias.isEmpty
-            ? translate('Connect')
-            : "${translate('Connect')} ${peer.id}");
+      context,
+      peer.id,
+      (peer.alias.isEmpty
+              ? translate('Connect')
+              : '${translate('Connect')} ${peer.id}') +
+          (forceSeparateWindow ? ' (${translate('separate window')})' : ''),
+      forceSeparateWindow: forceSeparateWindow,
+    );
   }
 
   @protected
@@ -796,7 +814,7 @@ class RecentPeerCard extends BasePeerCard {
   Future<List<MenuEntryBase<String>>> _buildMenuItems(
       BuildContext context) async {
     final List<MenuEntryBase<String>> menuItems = [
-      _connectAction(context, peer),
+      ..._connectActions(context, peer),
       _transferFileAction(context, peer.id),
     ];
 
@@ -852,7 +870,7 @@ class FavoritePeerCard extends BasePeerCard {
   Future<List<MenuEntryBase<String>>> _buildMenuItems(
       BuildContext context) async {
     final List<MenuEntryBase<String>> menuItems = [
-      _connectAction(context, peer),
+      ..._connectActions(context, peer),
       _transferFileAction(context, peer.id),
     ];
     if (isDesktop && peer.platform != 'Android') {
@@ -902,7 +920,7 @@ class DiscoveredPeerCard extends BasePeerCard {
   Future<List<MenuEntryBase<String>>> _buildMenuItems(
       BuildContext context) async {
     final List<MenuEntryBase<String>> menuItems = [
-      _connectAction(context, peer),
+      ..._connectActions(context, peer),
       _transferFileAction(context, peer.id),
     ];
 
@@ -954,7 +972,7 @@ class AddressBookPeerCard extends BasePeerCard {
   Future<List<MenuEntryBase<String>>> _buildMenuItems(
       BuildContext context) async {
     final List<MenuEntryBase<String>> menuItems = [
-      _connectAction(context, peer),
+      ..._connectActions(context, peer),
       _transferFileAction(context, peer.id),
     ];
     if (isDesktop && peer.platform != 'Android') {
@@ -1016,7 +1034,7 @@ class MyGroupPeerCard extends BasePeerCard {
   Future<List<MenuEntryBase<String>>> _buildMenuItems(
       BuildContext context) async {
     final List<MenuEntryBase<String>> menuItems = [
-      _connectAction(context, peer),
+      ..._connectActions(context, peer),
       _transferFileAction(context, peer.id),
     ];
     if (isDesktop && peer.platform != 'Android') {
diff --git a/flutter/lib/desktop/pages/desktop_home_page.dart b/flutter/lib/desktop/pages/desktop_home_page.dart
index 6b7fe7140..43c73b0b5 100644
--- a/flutter/lib/desktop/pages/desktop_home_page.dart
+++ b/flutter/lib/desktop/pages/desktop_home_page.dart
@@ -556,7 +556,7 @@ class _DesktopHomePageState extends State<DesktopHomePage>
       } else if (call.method == kWindowEventHide) {
         final wId = call.arguments['id'];
         final isSeparateWindowEnabled =
-            mainGetBoolOptionSync(kOptionSeparateRemoteWindow);
+            mainGetLocalBoolOptionSync(kOptionSeparateRemoteWindow);
         if (isSeparateWindowEnabled && !kCloseMultiWindowByHide) {
           await rustDeskWinManager.destroyWindow(wId);
         }
@@ -568,6 +568,7 @@ class _DesktopHomePageState extends State<DesktopHomePage>
           isTcpTunneling: call.arguments['isTcpTunneling'],
           isRDP: call.arguments['isRDP'],
           forceRelay: call.arguments['forceRelay'],
+          forceSeparateWindow: call.arguments['forceSeparateWindow'],
         );
       }
     });
diff --git a/flutter/lib/desktop/pages/remote_page.dart b/flutter/lib/desktop/pages/remote_page.dart
index d9f4d4ec2..7ffa527fe 100644
--- a/flutter/lib/desktop/pages/remote_page.dart
+++ b/flutter/lib/desktop/pages/remote_page.dart
@@ -112,7 +112,7 @@ class _RemotePageState extends State<RemotePage>
       Wakelock.enable();
     }
     // Register texture.
-    if (mainGetBoolOptionSync(kOptionSeparateRemoteWindow)) {
+    if (mainGetLocalBoolOptionSync(kOptionSeparateRemoteWindow)) {
       _renderTexture = renderTexture;
     } else {
       _renderTexture = RenderTexture();
diff --git a/flutter/lib/utils/multi_window_manager.dart b/flutter/lib/utils/multi_window_manager.dart
index 3fcb17c2b..720b7dc95 100644
--- a/flutter/lib/utils/multi_window_manager.dart
+++ b/flutter/lib/utils/multi_window_manager.dart
@@ -52,6 +52,7 @@ class RustDeskMultiWindowManager {
     bool? forceRelay,
     String? switchUuid,
     bool? isRDP,
+    bool forceSeparateWindow = false,
   }) async {
     var params = {
       "type": type.index,
@@ -70,7 +71,9 @@ class RustDeskMultiWindowManager {
     newSessionWindow() async {
       final windowController = await DesktopMultiWindow.createWindow(msg);
       windowController
-        ..setFrame(const Offset(0, 0) & Size(1280 + windowController.windowId * 20, 720 + windowController.windowId * 20))
+        ..setFrame(const Offset(0, 0) &
+            Size(1280 + windowController.windowId * 20,
+                720 + windowController.windowId * 20))
         ..center()
         ..setTitle(getWindowNameWithId(
           remoteId,
@@ -84,8 +87,9 @@ class RustDeskMultiWindowManager {
     }
 
     // separate window for file transfer is not supported
-    bool separateWindow = type != WindowType.FileTransfer &&
-        mainGetBoolOptionSync(kOptionSeparateRemoteWindow);
+    bool separateWindow = forceSeparateWindow ||
+        (type != WindowType.FileTransfer &&
+            mainGetLocalBoolOptionSync(kOptionSeparateRemoteWindow));
 
     if (windows.length > 1 || separateWindow) {
       for (final windowId in windows) {
@@ -123,6 +127,7 @@ class RustDeskMultiWindowManager {
     String? password,
     String? switchUuid,
     bool? forceRelay,
+    bool forceSeparateWindow = false,
   }) async {
     return await newSession(
       WindowType.RemoteDesktop,
@@ -132,6 +137,7 @@ class RustDeskMultiWindowManager {
       password: password,
       forceRelay: forceRelay,
       switchUuid: switchUuid,
+      forceSeparateWindow: forceSeparateWindow,
     );
   }
 
@@ -165,8 +171,7 @@ class RustDeskMultiWindowManager {
     if (wnds.isEmpty) {
       return;
     }
-    return await DesktopMultiWindow.invokeMethod(
-        wnds[0], methodName, args);
+    return await DesktopMultiWindow.invokeMethod(wnds[0], methodName, args);
   }
 
   List<int> _findWindowsByType(WindowType type) {
diff --git a/src/lang/ca.rs b/src/lang/ca.rs
index 51a731c35..326ef5dd0 100644
--- a/src/lang/ca.rs
+++ b/src/lang/ca.rs
@@ -524,5 +524,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("exceed_max_devices", ""),
         ("Sync with recent sessions", ""),
         ("Sort tags", ""),
+        ("Separate remote window", ""),
+        ("separate window", ""),
     ].iter().cloned().collect();
 }
diff --git a/src/lang/cn.rs b/src/lang/cn.rs
index b4a76c62e..f52cb9b61 100644
--- a/src/lang/cn.rs
+++ b/src/lang/cn.rs
@@ -524,5 +524,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("exceed_max_devices", "管理的设备数已达到最大值"),
         ("Sync with recent sessions", "同步最近会话"),
         ("Sort tags", "对标签进行排序"),
+        ("Separate remote window", "使用独立远程窗口"),
+        ("separate window", "独立窗口"),
     ].iter().cloned().collect();
 }
diff --git a/src/lang/cs.rs b/src/lang/cs.rs
index 29898eaf7..a61c46001 100644
--- a/src/lang/cs.rs
+++ b/src/lang/cs.rs
@@ -524,5 +524,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("exceed_max_devices", ""),
         ("Sync with recent sessions", ""),
         ("Sort tags", ""),
+        ("Separate remote window", ""),
+        ("separate window", ""),
     ].iter().cloned().collect();
 }
diff --git a/src/lang/da.rs b/src/lang/da.rs
index 0a4adaf36..c3f43b7f1 100644
--- a/src/lang/da.rs
+++ b/src/lang/da.rs
@@ -524,5 +524,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("exceed_max_devices", ""),
         ("Sync with recent sessions", ""),
         ("Sort tags", ""),
+        ("Separate remote window", ""),
+        ("separate window", ""),
     ].iter().cloned().collect();
 }
diff --git a/src/lang/de.rs b/src/lang/de.rs
index c42ac5719..e59eb63d6 100644
--- a/src/lang/de.rs
+++ b/src/lang/de.rs
@@ -524,5 +524,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("exceed_max_devices", "Sie haben die maximale Anzahl der verwalteten Geräte erreicht."),
         ("Sync with recent sessions", "Synchronisierung mit den letzten Sitzungen"),
         ("Sort tags", "Tags sortieren"),
+        ("Separate remote window", ""),
+        ("separate window", ""),
     ].iter().cloned().collect();
 }
diff --git a/src/lang/el.rs b/src/lang/el.rs
index eb91e9a83..83160cae7 100644
--- a/src/lang/el.rs
+++ b/src/lang/el.rs
@@ -524,5 +524,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("exceed_max_devices", ""),
         ("Sync with recent sessions", ""),
         ("Sort tags", ""),
+        ("Separate remote window", ""),
+        ("separate window", ""),
     ].iter().cloned().collect();
 }
diff --git a/src/lang/eo.rs b/src/lang/eo.rs
index a576538ef..47792961a 100644
--- a/src/lang/eo.rs
+++ b/src/lang/eo.rs
@@ -524,5 +524,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("exceed_max_devices", ""),
         ("Sync with recent sessions", ""),
         ("Sort tags", ""),
+        ("Separate remote window", ""),
+        ("separate window", ""),
     ].iter().cloned().collect();
 }
diff --git a/src/lang/es.rs b/src/lang/es.rs
index c39bcb7f5..b57474793 100644
--- a/src/lang/es.rs
+++ b/src/lang/es.rs
@@ -524,5 +524,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("exceed_max_devices", "Has alcanzado el máximo número de dispositivos administrados."),
         ("Sync with recent sessions", "Sincronizar con sesiones recientes"),
         ("Sort tags", "Ordenar etiquetas"),
+        ("Separate remote window", ""),
+        ("separate window", ""),
     ].iter().cloned().collect();
 }
diff --git a/src/lang/fa.rs b/src/lang/fa.rs
index 112edf32a..6f2531b46 100644
--- a/src/lang/fa.rs
+++ b/src/lang/fa.rs
@@ -524,5 +524,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("exceed_max_devices", ""),
         ("Sync with recent sessions", ""),
         ("Sort tags", ""),
+        ("Separate remote window", ""),
+        ("separate window", ""),
     ].iter().cloned().collect();
 }
diff --git a/src/lang/fr.rs b/src/lang/fr.rs
index 57c548e08..679620a99 100644
--- a/src/lang/fr.rs
+++ b/src/lang/fr.rs
@@ -524,5 +524,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("exceed_max_devices", ""),
         ("Sync with recent sessions", ""),
         ("Sort tags", ""),
+        ("Separate remote window", ""),
+        ("separate window", ""),
     ].iter().cloned().collect();
 }
diff --git a/src/lang/hu.rs b/src/lang/hu.rs
index 638ed3adf..8eacb75d3 100644
--- a/src/lang/hu.rs
+++ b/src/lang/hu.rs
@@ -524,5 +524,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("exceed_max_devices", ""),
         ("Sync with recent sessions", ""),
         ("Sort tags", ""),
+        ("Separate remote window", ""),
+        ("separate window", ""),
     ].iter().cloned().collect();
 }
diff --git a/src/lang/id.rs b/src/lang/id.rs
index ac9df01b3..2d12c31e5 100644
--- a/src/lang/id.rs
+++ b/src/lang/id.rs
@@ -524,5 +524,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("exceed_max_devices", ""),
         ("Sync with recent sessions", ""),
         ("Sort tags", ""),
+        ("Separate remote window", ""),
+        ("separate window", ""),
     ].iter().cloned().collect();
 }
diff --git a/src/lang/it.rs b/src/lang/it.rs
index c89e6cf72..5118adc16 100644
--- a/src/lang/it.rs
+++ b/src/lang/it.rs
@@ -524,5 +524,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("exceed_max_devices", "Hai raggiunto il numero massimo di dispositivi gestibili."),
         ("Sync with recent sessions", "Sincronizza con le sessioni recenti"),
         ("Sort tags", "Ordina etichette"),
+        ("Separate remote window", ""),
+        ("separate window", ""),
     ].iter().cloned().collect();
 }
diff --git a/src/lang/ja.rs b/src/lang/ja.rs
index 67234039d..ed09d6132 100644
--- a/src/lang/ja.rs
+++ b/src/lang/ja.rs
@@ -524,5 +524,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("exceed_max_devices", ""),
         ("Sync with recent sessions", ""),
         ("Sort tags", ""),
+        ("Separate remote window", ""),
+        ("separate window", ""),
     ].iter().cloned().collect();
 }
diff --git a/src/lang/ko.rs b/src/lang/ko.rs
index c0b71c205..d48347023 100644
--- a/src/lang/ko.rs
+++ b/src/lang/ko.rs
@@ -524,5 +524,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("exceed_max_devices", ""),
         ("Sync with recent sessions", ""),
         ("Sort tags", ""),
+        ("Separate remote window", ""),
+        ("separate window", ""),
     ].iter().cloned().collect();
 }
diff --git a/src/lang/kz.rs b/src/lang/kz.rs
index 829c59c73..1bcadec64 100644
--- a/src/lang/kz.rs
+++ b/src/lang/kz.rs
@@ -524,5 +524,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("exceed_max_devices", ""),
         ("Sync with recent sessions", ""),
         ("Sort tags", ""),
+        ("Separate remote window", ""),
+        ("separate window", ""),
     ].iter().cloned().collect();
 }
diff --git a/src/lang/lt.rs b/src/lang/lt.rs
index 69936b2b4..accdf9a39 100644
--- a/src/lang/lt.rs
+++ b/src/lang/lt.rs
@@ -524,5 +524,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("exceed_max_devices", ""),
         ("Sync with recent sessions", ""),
         ("Sort tags", ""),
+        ("Separate remote window", ""),
+        ("separate window", ""),
     ].iter().cloned().collect();
 }
diff --git a/src/lang/nl.rs b/src/lang/nl.rs
index c470f2270..b1bcd1d2a 100644
--- a/src/lang/nl.rs
+++ b/src/lang/nl.rs
@@ -524,5 +524,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("exceed_max_devices", "Het maximum aantal gecontroleerde apparaten is bereikt."),
         ("Sync with recent sessions", "Recente sessies synchroniseren"),
         ("Sort tags", "Labels sorteren"),
+        ("Separate remote window", ""),
+        ("separate window", ""),
     ].iter().cloned().collect();
 }
diff --git a/src/lang/pl.rs b/src/lang/pl.rs
index af6d11659..1d813ef41 100644
--- a/src/lang/pl.rs
+++ b/src/lang/pl.rs
@@ -524,5 +524,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("exceed_max_devices", ""),
         ("Sync with recent sessions", ""),
         ("Sort tags", ""),
+        ("Separate remote window", ""),
+        ("separate window", ""),
     ].iter().cloned().collect();
 }
diff --git a/src/lang/pt_PT.rs b/src/lang/pt_PT.rs
index 52675daf7..6b32a1e48 100644
--- a/src/lang/pt_PT.rs
+++ b/src/lang/pt_PT.rs
@@ -524,5 +524,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("exceed_max_devices", ""),
         ("Sync with recent sessions", ""),
         ("Sort tags", ""),
+        ("Separate remote window", ""),
+        ("separate window", ""),
     ].iter().cloned().collect();
 }
diff --git a/src/lang/ptbr.rs b/src/lang/ptbr.rs
index 195b79804..c732dd2af 100644
--- a/src/lang/ptbr.rs
+++ b/src/lang/ptbr.rs
@@ -524,5 +524,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("exceed_max_devices", ""),
         ("Sync with recent sessions", ""),
         ("Sort tags", ""),
+        ("Separate remote window", ""),
+        ("separate window", ""),
     ].iter().cloned().collect();
 }
diff --git a/src/lang/ro.rs b/src/lang/ro.rs
index 378d7c035..4db68ee50 100644
--- a/src/lang/ro.rs
+++ b/src/lang/ro.rs
@@ -524,5 +524,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("exceed_max_devices", ""),
         ("Sync with recent sessions", ""),
         ("Sort tags", ""),
+        ("Separate remote window", ""),
+        ("separate window", ""),
     ].iter().cloned().collect();
 }
diff --git a/src/lang/ru.rs b/src/lang/ru.rs
index 6b48ef20b..9dcef1a48 100644
--- a/src/lang/ru.rs
+++ b/src/lang/ru.rs
@@ -524,5 +524,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("exceed_max_devices", "Достигнуто максимальне количество управляемых устройств."),
         ("Sync with recent sessions", "Синхронизация последних сессий"),
         ("Sort tags", "Сортировка меток"),
+        ("Separate remote window", ""),
+        ("separate window", ""),
     ].iter().cloned().collect();
 }
diff --git a/src/lang/sk.rs b/src/lang/sk.rs
index f24f55bef..3f8d57169 100644
--- a/src/lang/sk.rs
+++ b/src/lang/sk.rs
@@ -524,5 +524,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("exceed_max_devices", ""),
         ("Sync with recent sessions", ""),
         ("Sort tags", ""),
+        ("Separate remote window", ""),
+        ("separate window", ""),
     ].iter().cloned().collect();
 }
diff --git a/src/lang/sl.rs b/src/lang/sl.rs
index ff5c254e0..e3c17a659 100755
--- a/src/lang/sl.rs
+++ b/src/lang/sl.rs
@@ -524,5 +524,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("exceed_max_devices", ""),
         ("Sync with recent sessions", ""),
         ("Sort tags", ""),
+        ("Separate remote window", ""),
+        ("separate window", ""),
     ].iter().cloned().collect();
 }
diff --git a/src/lang/sq.rs b/src/lang/sq.rs
index 797328139..46db68578 100644
--- a/src/lang/sq.rs
+++ b/src/lang/sq.rs
@@ -524,5 +524,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("exceed_max_devices", ""),
         ("Sync with recent sessions", ""),
         ("Sort tags", ""),
+        ("Separate remote window", ""),
+        ("separate window", ""),
     ].iter().cloned().collect();
 }
diff --git a/src/lang/sr.rs b/src/lang/sr.rs
index 3bb40f4ce..370865e0a 100644
--- a/src/lang/sr.rs
+++ b/src/lang/sr.rs
@@ -524,5 +524,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("exceed_max_devices", ""),
         ("Sync with recent sessions", ""),
         ("Sort tags", ""),
+        ("Separate remote window", ""),
+        ("separate window", ""),
     ].iter().cloned().collect();
 }
diff --git a/src/lang/sv.rs b/src/lang/sv.rs
index ac898e38f..3ec8535ef 100644
--- a/src/lang/sv.rs
+++ b/src/lang/sv.rs
@@ -524,5 +524,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("exceed_max_devices", ""),
         ("Sync with recent sessions", ""),
         ("Sort tags", ""),
+        ("Separate remote window", ""),
+        ("separate window", ""),
     ].iter().cloned().collect();
 }
diff --git a/src/lang/template.rs b/src/lang/template.rs
index 5c710624f..7eb168fdf 100644
--- a/src/lang/template.rs
+++ b/src/lang/template.rs
@@ -524,5 +524,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("exceed_max_devices", ""),
         ("Sync with recent sessions", ""),
         ("Sort tags", ""),
+        ("Separate remote window", ""),
+        ("separate window", ""),
     ].iter().cloned().collect();
 }
diff --git a/src/lang/th.rs b/src/lang/th.rs
index 2b2d0f4b2..f125384de 100644
--- a/src/lang/th.rs
+++ b/src/lang/th.rs
@@ -524,5 +524,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("exceed_max_devices", ""),
         ("Sync with recent sessions", ""),
         ("Sort tags", ""),
+        ("Separate remote window", ""),
+        ("separate window", ""),
     ].iter().cloned().collect();
 }
diff --git a/src/lang/tr.rs b/src/lang/tr.rs
index d7bd99f25..b4959b158 100644
--- a/src/lang/tr.rs
+++ b/src/lang/tr.rs
@@ -524,5 +524,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("exceed_max_devices", ""),
         ("Sync with recent sessions", ""),
         ("Sort tags", ""),
+        ("Separate remote window", ""),
+        ("separate window", ""),
     ].iter().cloned().collect();
 }
diff --git a/src/lang/tw.rs b/src/lang/tw.rs
index bef733f00..cda76a154 100644
--- a/src/lang/tw.rs
+++ b/src/lang/tw.rs
@@ -524,5 +524,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("exceed_max_devices", ""),
         ("Sync with recent sessions", ""),
         ("Sort tags", ""),
+        ("Separate remote window", ""),
+        ("separate window", ""),
     ].iter().cloned().collect();
 }
diff --git a/src/lang/ua.rs b/src/lang/ua.rs
index 3b115a5f3..8d46b61ae 100644
--- a/src/lang/ua.rs
+++ b/src/lang/ua.rs
@@ -524,5 +524,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("exceed_max_devices", ""),
         ("Sync with recent sessions", ""),
         ("Sort tags", ""),
+        ("Separate remote window", ""),
+        ("separate window", ""),
     ].iter().cloned().collect();
 }
diff --git a/src/lang/vn.rs b/src/lang/vn.rs
index 59490da1d..c188e2d14 100644
--- a/src/lang/vn.rs
+++ b/src/lang/vn.rs
@@ -524,5 +524,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("exceed_max_devices", ""),
         ("Sync with recent sessions", ""),
         ("Sort tags", ""),
+        ("Separate remote window", ""),
+        ("separate window", ""),
     ].iter().cloned().collect();
 }