diff --git a/WireGuard/WireGuard/UI/macOS/TunnelsTracker.swift b/WireGuard/WireGuard/UI/macOS/TunnelsTracker.swift
index 9c93186..8df7789 100644
--- a/WireGuard/WireGuard/UI/macOS/TunnelsTracker.swift
+++ b/WireGuard/WireGuard/UI/macOS/TunnelsTracker.swift
@@ -10,8 +10,16 @@ import Cocoa
 
 class TunnelsTracker {
 
-    weak var statusMenu: StatusMenu?
-    weak var statusItemController: StatusItemController?
+    weak var statusMenu: StatusMenu? {
+        didSet {
+            statusMenu?.currentTunnel = currentTunnel
+        }
+    }
+    weak var statusItemController: StatusItemController? {
+        didSet {
+            statusItemController?.currentTunnel = currentTunnel
+        }
+    }
     weak var manageTunnelsRootVC: ManageTunnelsRootViewController?
 
     private var tunnelsManager: TunnelsManager