diff --git a/flutter/lib/common/widgets/peer_card.dart b/flutter/lib/common/widgets/peer_card.dart
index a1c800c8a..50beda75c 100644
--- a/flutter/lib/common/widgets/peer_card.dart
+++ b/flutter/lib/common/widgets/peer_card.dart
@@ -835,7 +835,7 @@ class RecentPeerCard extends BasePeerCard {
     if (isDesktop && peer.platform != 'Android') {
       menuItems.add(_tcpTunnelingAction(context, peer.id));
     }
-    menuItems.add(await _openNewConnInOptAction(peer.id));
+    // menuItems.add(await _openNewConnInOptAction(peer.id));
     menuItems.add(await _forceAlwaysRelayAction(peer.id));
     if (peer.platform == 'Windows') {
       menuItems.add(_rdpAction(context, peer.id));
@@ -889,7 +889,7 @@ class FavoritePeerCard extends BasePeerCard {
     if (isDesktop && peer.platform != 'Android') {
       menuItems.add(_tcpTunnelingAction(context, peer.id));
     }
-    menuItems.add(await _openNewConnInOptAction(peer.id));
+    // menuItems.add(await _openNewConnInOptAction(peer.id));
     menuItems.add(await _forceAlwaysRelayAction(peer.id));
     if (peer.platform == 'Windows') {
       menuItems.add(_rdpAction(context, peer.id));
@@ -943,7 +943,7 @@ class DiscoveredPeerCard extends BasePeerCard {
     if (isDesktop && peer.platform != 'Android') {
       menuItems.add(_tcpTunnelingAction(context, peer.id));
     }
-    menuItems.add(await _openNewConnInOptAction(peer.id));
+    // menuItems.add(await _openNewConnInOptAction(peer.id));
     menuItems.add(await _forceAlwaysRelayAction(peer.id));
     if (peer.platform == 'Windows') {
       menuItems.add(_rdpAction(context, peer.id));
@@ -993,7 +993,7 @@ class AddressBookPeerCard extends BasePeerCard {
     if (isDesktop && peer.platform != 'Android') {
       menuItems.add(_tcpTunnelingAction(context, peer.id));
     }
-    menuItems.add(await _openNewConnInOptAction(peer.id));
+    // menuItems.add(await _openNewConnInOptAction(peer.id));
     menuItems.add(await _forceAlwaysRelayAction(peer.id));
     if (peer.platform == 'Windows') {
       menuItems.add(_rdpAction(context, peer.id));
@@ -1056,7 +1056,7 @@ class MyGroupPeerCard extends BasePeerCard {
     if (isDesktop && peer.platform != 'Android') {
       menuItems.add(_tcpTunnelingAction(context, peer.id));
     }
-    menuItems.add(await _openNewConnInOptAction(peer.id));
+    // menuItems.add(await _openNewConnInOptAction(peer.id));
     menuItems.add(await _forceAlwaysRelayAction(peer.id));
     if (peer.platform == 'Windows') {
       menuItems.add(_rdpAction(context, peer.id));
diff --git a/flutter/lib/utils/multi_window_manager.dart b/flutter/lib/utils/multi_window_manager.dart
index abd76238e..e87551d6b 100644
--- a/flutter/lib/utils/multi_window_manager.dart
+++ b/flutter/lib/utils/multi_window_manager.dart
@@ -134,14 +134,8 @@ class RustDeskMultiWindowManager {
     final msg = jsonEncode(params);
 
     // separate window for file transfer is not supported
-    bool openInTabs = false;
-    if (type == WindowType.RemoteDesktop) {
-      if (mainGetLocalBoolOptionSync(kOptionOpenNewConnInTabs)) {
-        openInTabs = !mainGetPeerBoolOptionSync(remoteId, kOptionOpenInWindows);
-      } else {
-        openInTabs = mainGetPeerBoolOptionSync(remoteId, kOptionOpenInTabs);
-      }
-    }
+    bool openInTabs = type != WindowType.RemoteDesktop ||
+        mainGetLocalBoolOptionSync(kOptionOpenNewConnInTabs);
 
     if (windows.length > 1 || !openInTabs) {
       for (final windowId in windows) {
diff --git a/src/lang/ca.rs b/src/lang/ca.rs
index 0bf0bb3e4..c88e07198 100644
--- a/src/lang/ca.rs
+++ b/src/lang/ca.rs
@@ -525,8 +525,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Sync with recent sessions", ""),
         ("Sort tags", ""),
         ("Open new connections in tabs", ""),
-        ("Open in Tabs", ""),
-        ("Open with New Window", ""),
         ("separate window", ""),
         ("Move tab to new window", ""),
     ].iter().cloned().collect();
diff --git a/src/lang/cn.rs b/src/lang/cn.rs
index d13914094..644882b64 100644
--- a/src/lang/cn.rs
+++ b/src/lang/cn.rs
@@ -525,8 +525,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Sync with recent sessions", "同步最近会话"),
         ("Sort tags", "对标签进行排序"),
         ("Open new connections in tabs", "在选项卡中打开新连接"),
-        ("Open in Tabs", "在选项卡中打开"),
-        ("Open with New Window", "在新窗口中打开"),
         ("separate window", "独立窗口"),
         ("Move tab to new window", "将标签页移至新窗口"),
     ].iter().cloned().collect();
diff --git a/src/lang/cs.rs b/src/lang/cs.rs
index c857c1a60..2c0f62a8a 100644
--- a/src/lang/cs.rs
+++ b/src/lang/cs.rs
@@ -525,8 +525,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Sync with recent sessions", ""),
         ("Sort tags", ""),
         ("Open new connections in tabs", ""),
-        ("Open in Tabs", ""),
-        ("Open with New Window", ""),
         ("separate window", ""),
         ("Move tab to new window", ""),
     ].iter().cloned().collect();
diff --git a/src/lang/da.rs b/src/lang/da.rs
index 26d35390a..0da788f32 100644
--- a/src/lang/da.rs
+++ b/src/lang/da.rs
@@ -525,8 +525,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Sync with recent sessions", ""),
         ("Sort tags", ""),
         ("Open new connections in tabs", ""),
-        ("Open in Tabs", ""),
-        ("Open with New Window", ""),
         ("separate window", ""),
         ("Move tab to new window", ""),
     ].iter().cloned().collect();
diff --git a/src/lang/de.rs b/src/lang/de.rs
index 5dbaaac12..e177ccd14 100644
--- a/src/lang/de.rs
+++ b/src/lang/de.rs
@@ -525,8 +525,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Sync with recent sessions", "Synchronisierung mit den letzten Sitzungen"),
         ("Sort tags", "Tags sortieren"),
         ("Open new connections in tabs", ""),
-        ("Open in Tabs", ""),
-        ("Open with New Window", ""),
         ("separate window", "Separates Fenster"),
         ("Move tab to new window", "Tab in neues Fenster verschieben"),
     ].iter().cloned().collect();
diff --git a/src/lang/el.rs b/src/lang/el.rs
index 3a6bda3f9..c98065d55 100644
--- a/src/lang/el.rs
+++ b/src/lang/el.rs
@@ -525,8 +525,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Sync with recent sessions", ""),
         ("Sort tags", ""),
         ("Open new connections in tabs", ""),
-        ("Open in Tabs", ""),
-        ("Open with New Window", ""),
         ("separate window", ""),
         ("Move tab to new window", ""),
     ].iter().cloned().collect();
diff --git a/src/lang/eo.rs b/src/lang/eo.rs
index c0259aff0..2959f8224 100644
--- a/src/lang/eo.rs
+++ b/src/lang/eo.rs
@@ -525,8 +525,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Sync with recent sessions", ""),
         ("Sort tags", ""),
         ("Open new connections in tabs", ""),
-        ("Open in Tabs", ""),
-        ("Open with New Window", ""),
         ("separate window", ""),
         ("Move tab to new window", ""),
     ].iter().cloned().collect();
diff --git a/src/lang/es.rs b/src/lang/es.rs
index da98bcb43..40b0f8aa2 100644
--- a/src/lang/es.rs
+++ b/src/lang/es.rs
@@ -525,8 +525,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Sync with recent sessions", "Sincronizar con sesiones recientes"),
         ("Sort tags", "Ordenar etiquetas"),
         ("Open new connections in tabs", ""),
-        ("Open in Tabs", ""),
-        ("Open with New Window", ""),
         ("separate window", ""),
         ("Move tab to new window", ""),
     ].iter().cloned().collect();
diff --git a/src/lang/fa.rs b/src/lang/fa.rs
index bb61497f0..d7ffcba2d 100644
--- a/src/lang/fa.rs
+++ b/src/lang/fa.rs
@@ -525,8 +525,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Sync with recent sessions", ""),
         ("Sort tags", ""),
         ("Open new connections in tabs", ""),
-        ("Open in Tabs", ""),
-        ("Open with New Window", ""),
         ("separate window", ""),
         ("Move tab to new window", ""),
     ].iter().cloned().collect();
diff --git a/src/lang/fr.rs b/src/lang/fr.rs
index e1c79e528..d5d2bf162 100644
--- a/src/lang/fr.rs
+++ b/src/lang/fr.rs
@@ -525,8 +525,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Sync with recent sessions", ""),
         ("Sort tags", ""),
         ("Open new connections in tabs", ""),
-        ("Open in Tabs", ""),
-        ("Open with New Window", ""),
         ("separate window", ""),
         ("Move tab to new window", ""),
     ].iter().cloned().collect();
diff --git a/src/lang/hu.rs b/src/lang/hu.rs
index 4fea28276..b4a51e1ca 100644
--- a/src/lang/hu.rs
+++ b/src/lang/hu.rs
@@ -525,8 +525,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Sync with recent sessions", ""),
         ("Sort tags", ""),
         ("Open new connections in tabs", ""),
-        ("Open in Tabs", ""),
-        ("Open with New Window", ""),
         ("separate window", ""),
         ("Move tab to new window", ""),
     ].iter().cloned().collect();
diff --git a/src/lang/id.rs b/src/lang/id.rs
index 3549da2b6..0be40ee12 100644
--- a/src/lang/id.rs
+++ b/src/lang/id.rs
@@ -525,8 +525,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Sync with recent sessions", ""),
         ("Sort tags", ""),
         ("Open new connections in tabs", ""),
-        ("Open in Tabs", ""),
-        ("Open with New Window", ""),
         ("separate window", ""),
         ("Move tab to new window", ""),
     ].iter().cloned().collect();
diff --git a/src/lang/it.rs b/src/lang/it.rs
index ded2e5a01..f0091ec0f 100644
--- a/src/lang/it.rs
+++ b/src/lang/it.rs
@@ -525,8 +525,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Sync with recent sessions", "Sincronizza con le sessioni recenti"),
         ("Sort tags", "Ordina etichette"),
         ("Open new connections in tabs", ""),
-        ("Open in Tabs", ""),
-        ("Open with New Window", ""),
         ("separate window", "Separa finestra"),
         ("Move tab to new window", "Sposta scheda nella finestra successiva"),
     ].iter().cloned().collect();
diff --git a/src/lang/ja.rs b/src/lang/ja.rs
index 334e99bda..5cb55777a 100644
--- a/src/lang/ja.rs
+++ b/src/lang/ja.rs
@@ -525,8 +525,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Sync with recent sessions", ""),
         ("Sort tags", ""),
         ("Open new connections in tabs", ""),
-        ("Open in Tabs", ""),
-        ("Open with New Window", ""),
         ("separate window", ""),
         ("Move tab to new window", ""),
     ].iter().cloned().collect();
diff --git a/src/lang/ko.rs b/src/lang/ko.rs
index 6cc4170f5..0e3a3b614 100644
--- a/src/lang/ko.rs
+++ b/src/lang/ko.rs
@@ -525,8 +525,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Sync with recent sessions", ""),
         ("Sort tags", ""),
         ("Open new connections in tabs", ""),
-        ("Open in Tabs", ""),
-        ("Open with New Window", ""),
         ("separate window", ""),
         ("Move tab to new window", ""),
     ].iter().cloned().collect();
diff --git a/src/lang/kz.rs b/src/lang/kz.rs
index 59ef40dcd..378466334 100644
--- a/src/lang/kz.rs
+++ b/src/lang/kz.rs
@@ -525,8 +525,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Sync with recent sessions", ""),
         ("Sort tags", ""),
         ("Open new connections in tabs", ""),
-        ("Open in Tabs", ""),
-        ("Open with New Window", ""),
         ("separate window", ""),
         ("Move tab to new window", ""),
     ].iter().cloned().collect();
diff --git a/src/lang/lt.rs b/src/lang/lt.rs
index 3f8bbdc5e..e1ff74feb 100644
--- a/src/lang/lt.rs
+++ b/src/lang/lt.rs
@@ -525,8 +525,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Sync with recent sessions", ""),
         ("Sort tags", ""),
         ("Open new connections in tabs", ""),
-        ("Open in Tabs", ""),
-        ("Open with New Window", ""),
         ("separate window", ""),
         ("Move tab to new window", ""),
     ].iter().cloned().collect();
diff --git a/src/lang/nl.rs b/src/lang/nl.rs
index 9ef86b6ca..4c6b7cc05 100644
--- a/src/lang/nl.rs
+++ b/src/lang/nl.rs
@@ -525,8 +525,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Sync with recent sessions", "Recente sessies synchroniseren"),
         ("Sort tags", "Labels sorteren"),
         ("Open new connections in tabs", ""),
-        ("Open in Tabs", ""),
-        ("Open with New Window", ""),
         ("separate window", ""),
         ("Move tab to new window", ""),
     ].iter().cloned().collect();
diff --git a/src/lang/pl.rs b/src/lang/pl.rs
index e77f64367..21deb87a8 100644
--- a/src/lang/pl.rs
+++ b/src/lang/pl.rs
@@ -525,8 +525,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Sync with recent sessions", "Synchronizacja z ostatnimi sesjami"),
         ("Sort tags", "Znaczniki sortowania"),
         ("Open new connections in tabs", ""),
-        ("Open in Tabs", ""),
-        ("Open with New Window", ""),
         ("separate window", "oddzielne okno"),
         ("Move tab to new window", "Przenieś zakładkę do nowego okna"),
     ].iter().cloned().collect();
diff --git a/src/lang/pt_PT.rs b/src/lang/pt_PT.rs
index 7f54d1667..40653dc67 100644
--- a/src/lang/pt_PT.rs
+++ b/src/lang/pt_PT.rs
@@ -525,8 +525,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Sync with recent sessions", ""),
         ("Sort tags", ""),
         ("Open new connections in tabs", ""),
-        ("Open in Tabs", ""),
-        ("Open with New Window", ""),
         ("separate window", ""),
         ("Move tab to new window", ""),
     ].iter().cloned().collect();
diff --git a/src/lang/ptbr.rs b/src/lang/ptbr.rs
index 7f55d2597..4544bbe3a 100644
--- a/src/lang/ptbr.rs
+++ b/src/lang/ptbr.rs
@@ -525,8 +525,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Sync with recent sessions", ""),
         ("Sort tags", ""),
         ("Open new connections in tabs", ""),
-        ("Open in Tabs", ""),
-        ("Open with New Window", ""),
         ("separate window", ""),
         ("Move tab to new window", ""),
     ].iter().cloned().collect();
diff --git a/src/lang/ro.rs b/src/lang/ro.rs
index 3ce0446f5..eca9f0263 100644
--- a/src/lang/ro.rs
+++ b/src/lang/ro.rs
@@ -525,8 +525,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Sync with recent sessions", ""),
         ("Sort tags", ""),
         ("Open new connections in tabs", ""),
-        ("Open in Tabs", ""),
-        ("Open with New Window", ""),
         ("separate window", ""),
         ("Move tab to new window", ""),
     ].iter().cloned().collect();
diff --git a/src/lang/ru.rs b/src/lang/ru.rs
index a23030e1d..13164a4dc 100644
--- a/src/lang/ru.rs
+++ b/src/lang/ru.rs
@@ -525,8 +525,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Sync with recent sessions", "Синхронизация последних сессий"),
         ("Sort tags", "Сортировка меток"),
         ("Open new connections in tabs", ""),
-        ("Open in Tabs", ""),
-        ("Open with New Window", ""),
         ("separate window", "отдельное окно"),
         ("Move tab to new window", "Переместить вкладку в отдельное окно"),
     ].iter().cloned().collect();
diff --git a/src/lang/sk.rs b/src/lang/sk.rs
index 5f74a0721..b27b28863 100644
--- a/src/lang/sk.rs
+++ b/src/lang/sk.rs
@@ -525,8 +525,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Sync with recent sessions", ""),
         ("Sort tags", ""),
         ("Open new connections in tabs", ""),
-        ("Open in Tabs", ""),
-        ("Open with New Window", ""),
         ("separate window", ""),
         ("Move tab to new window", ""),
     ].iter().cloned().collect();
diff --git a/src/lang/sl.rs b/src/lang/sl.rs
index f4a7946ca..99eb2371b 100755
--- a/src/lang/sl.rs
+++ b/src/lang/sl.rs
@@ -525,8 +525,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Sync with recent sessions", ""),
         ("Sort tags", ""),
         ("Open new connections in tabs", ""),
-        ("Open in Tabs", ""),
-        ("Open with New Window", ""),
         ("separate window", ""),
         ("Move tab to new window", ""),
     ].iter().cloned().collect();
diff --git a/src/lang/sq.rs b/src/lang/sq.rs
index dfaad1051..251e11a29 100644
--- a/src/lang/sq.rs
+++ b/src/lang/sq.rs
@@ -525,8 +525,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Sync with recent sessions", ""),
         ("Sort tags", ""),
         ("Open new connections in tabs", ""),
-        ("Open in Tabs", ""),
-        ("Open with New Window", ""),
         ("separate window", ""),
         ("Move tab to new window", ""),
     ].iter().cloned().collect();
diff --git a/src/lang/sr.rs b/src/lang/sr.rs
index be85ffcba..d213cd277 100644
--- a/src/lang/sr.rs
+++ b/src/lang/sr.rs
@@ -525,8 +525,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Sync with recent sessions", ""),
         ("Sort tags", ""),
         ("Open new connections in tabs", ""),
-        ("Open in Tabs", ""),
-        ("Open with New Window", ""),
         ("separate window", ""),
         ("Move tab to new window", ""),
     ].iter().cloned().collect();
diff --git a/src/lang/sv.rs b/src/lang/sv.rs
index e8ef6c476..636423607 100644
--- a/src/lang/sv.rs
+++ b/src/lang/sv.rs
@@ -525,8 +525,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Sync with recent sessions", ""),
         ("Sort tags", ""),
         ("Open new connections in tabs", ""),
-        ("Open in Tabs", ""),
-        ("Open with New Window", ""),
         ("separate window", ""),
         ("Move tab to new window", ""),
     ].iter().cloned().collect();
diff --git a/src/lang/template.rs b/src/lang/template.rs
index c76b3b226..52cbcd172 100644
--- a/src/lang/template.rs
+++ b/src/lang/template.rs
@@ -525,8 +525,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Sync with recent sessions", ""),
         ("Sort tags", ""),
         ("Open new connections in tabs", ""),
-        ("Open in Tabs", ""),
-        ("Open with New Window", ""),
         ("separate window", ""),
         ("Move tab to new window", ""),
     ].iter().cloned().collect();
diff --git a/src/lang/th.rs b/src/lang/th.rs
index 056d0ca06..57363dacf 100644
--- a/src/lang/th.rs
+++ b/src/lang/th.rs
@@ -525,8 +525,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Sync with recent sessions", ""),
         ("Sort tags", ""),
         ("Open new connections in tabs", ""),
-        ("Open in Tabs", ""),
-        ("Open with New Window", ""),
         ("separate window", ""),
         ("Move tab to new window", ""),
     ].iter().cloned().collect();
diff --git a/src/lang/tr.rs b/src/lang/tr.rs
index 39dab06cf..c6c7fcc29 100644
--- a/src/lang/tr.rs
+++ b/src/lang/tr.rs
@@ -525,8 +525,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Sync with recent sessions", ""),
         ("Sort tags", ""),
         ("Open new connections in tabs", ""),
-        ("Open in Tabs", ""),
-        ("Open with New Window", ""),
         ("separate window", ""),
         ("Move tab to new window", ""),
     ].iter().cloned().collect();
diff --git a/src/lang/tw.rs b/src/lang/tw.rs
index d58f7e8fe..2390835ca 100644
--- a/src/lang/tw.rs
+++ b/src/lang/tw.rs
@@ -525,8 +525,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Sync with recent sessions", ""),
         ("Sort tags", ""),
         ("Open new connections in tabs", ""),
-        ("Open in Tabs", ""),
-        ("Open with New Window", ""),
         ("separate window", ""),
         ("Move tab to new window", ""),
     ].iter().cloned().collect();
diff --git a/src/lang/ua.rs b/src/lang/ua.rs
index 13e6cb1d0..d782bb26d 100644
--- a/src/lang/ua.rs
+++ b/src/lang/ua.rs
@@ -525,8 +525,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Sync with recent sessions", ""),
         ("Sort tags", ""),
         ("Open new connections in tabs", ""),
-        ("Open in Tabs", ""),
-        ("Open with New Window", ""),
         ("separate window", ""),
         ("Move tab to new window", ""),
     ].iter().cloned().collect();
diff --git a/src/lang/vn.rs b/src/lang/vn.rs
index 18c81f29b..041d056a0 100644
--- a/src/lang/vn.rs
+++ b/src/lang/vn.rs
@@ -525,8 +525,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Sync with recent sessions", ""),
         ("Sort tags", ""),
         ("Open new connections in tabs", ""),
-        ("Open in Tabs", ""),
-        ("Open with New Window", ""),
         ("separate window", ""),
         ("Move tab to new window", ""),
     ].iter().cloned().collect();