diff --git a/WireGuard/WireGuard/UI/iOS/TunnelDetailTableViewController.swift b/WireGuard/WireGuard/UI/iOS/TunnelDetailTableViewController.swift
index 5c6cf15..fffaeb9 100644
--- a/WireGuard/WireGuard/UI/iOS/TunnelDetailTableViewController.swift
+++ b/WireGuard/WireGuard/UI/iOS/TunnelDetailTableViewController.swift
@@ -276,7 +276,7 @@ class TunnelDetailTableViewStatusCell: UITableViewCell {
         DispatchQueue.main.async { [weak statusSwitch] in
             guard let statusSwitch = statusSwitch else { return }
             statusSwitch.isOn = !(status == .deactivating || status == .inactive)
-            statusSwitch.isUserInteractionEnabled = (status == .inactive || status == .active)
+            statusSwitch.isUserInteractionEnabled = (status == .inactive || status == .active || status == .waiting)
         }
         textLabel?.textColor = (status == .active || status == .inactive) ? UIColor.black : UIColor.gray
     }
diff --git a/WireGuard/WireGuard/UI/iOS/TunnelsListTableViewController.swift b/WireGuard/WireGuard/UI/iOS/TunnelsListTableViewController.swift
index b1102c4..7c76aa6 100644
--- a/WireGuard/WireGuard/UI/iOS/TunnelsListTableViewController.swift
+++ b/WireGuard/WireGuard/UI/iOS/TunnelsListTableViewController.swift
@@ -390,7 +390,7 @@ class TunnelsListTableViewCell: UITableViewCell {
         DispatchQueue.main.async { [weak statusSwitch, weak busyIndicator] in
             guard let statusSwitch = statusSwitch, let busyIndicator = busyIndicator else { return }
             statusSwitch.isOn = !(status == .deactivating || status == .inactive)
-            statusSwitch.isUserInteractionEnabled = (status == .inactive || status == .active)
+            statusSwitch.isUserInteractionEnabled = (status == .inactive || status == .active || status == .waiting)
             if (status == .inactive || status == .active) {
                 busyIndicator.stopAnimating()
             } else {