diff --git a/flutter/lib/desktop/pages/file_manager_tab_page.dart b/flutter/lib/desktop/pages/file_manager_tab_page.dart
index 09577128f..da76890d4 100644
--- a/flutter/lib/desktop/pages/file_manager_tab_page.dart
+++ b/flutter/lib/desktop/pages/file_manager_tab_page.dart
@@ -57,7 +57,7 @@ class _FileManagerTabPageState extends State<FileManagerTabPage> {
       } else if (call.method == "onDestroy") {
         tabController.state.value.tabs.forEach((tab) {
           print("executing onDestroy hook, closing ${tab.label}}");
-          final tag = tab.label;
+          final tag = 'ft_${tab.label}';
           ffi(tag).close().then((_) {
             Get.delete<FFI>(tag: tag);
           });
diff --git a/flutter/lib/desktop/pages/port_forward_tab_page.dart b/flutter/lib/desktop/pages/port_forward_tab_page.dart
index 28825b75a..6323a0af9 100644
--- a/flutter/lib/desktop/pages/port_forward_tab_page.dart
+++ b/flutter/lib/desktop/pages/port_forward_tab_page.dart
@@ -26,7 +26,7 @@ class _PortForwardTabPageState extends State<PortForwardTabPage> {
 
   _PortForwardTabPageState(Map<String, dynamic> params) {
     tabController.add(TabInfo(
-        key: params['id'] + params['isRDP'].toString(),
+        key: params['id'],
         label: params['id'],
         selectedIcon: selectedIcon,
         unselectedIcon: unselectedIcon,
@@ -61,7 +61,7 @@ class _PortForwardTabPageState extends State<PortForwardTabPage> {
       } else if (call.method == "onDestroy") {
         tabController.state.value.tabs.forEach((tab) {
           print("executing onDestroy hook, closing ${tab.label}}");
-          final tag = tab.label;
+          final tag = 'pf_${tab.label}';
           ffi(tag).close().then((_) {
             Get.delete<FFI>(tag: tag);
           });