diff --git a/android/src/main/java/com/tailscale/ipn/ui/viewModel/PeerDetailsViewModel.kt b/android/src/main/java/com/tailscale/ipn/ui/viewModel/PeerDetailsViewModel.kt
index a41b05b..372d887 100644
--- a/android/src/main/java/com/tailscale/ipn/ui/viewModel/PeerDetailsViewModel.kt
+++ b/android/src/main/java/com/tailscale/ipn/ui/viewModel/PeerDetailsViewModel.kt
@@ -6,13 +6,19 @@ package com.tailscale.ipn.ui.viewModel
 import androidx.compose.ui.graphics.Color
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.ViewModelProvider
+import androidx.lifecycle.viewModelScope
 import com.tailscale.ipn.R
+import com.tailscale.ipn.ui.model.Ipn
 import com.tailscale.ipn.ui.model.StableNodeID
 import com.tailscale.ipn.ui.notifier.Notifier
 import com.tailscale.ipn.ui.theme.ts_color_light_green
 import com.tailscale.ipn.ui.util.ComposableStringFormatter
 import com.tailscale.ipn.ui.util.DisplayAddress
 import com.tailscale.ipn.ui.util.TimeUtil
+import com.tailscale.ipn.ui.util.set
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.launch
 import java.io.File
 
 data class PeerSettingInfo(val titleRes: Int, val value: ComposableStringFormatter)
@@ -26,6 +32,9 @@ class PeerDetailsViewModelFactory(private val nodeId: StableNodeID, private val
 
 class PeerDetailsViewModel(val nodeId: StableNodeID, val filesDir: File) : IpnViewModel() {
 
+  // The peerID of the local node
+  val selfPeerId: StateFlow<StableNodeID> = MutableStateFlow("")
+
   var addresses: List<DisplayAddress> = emptyList()
   var info: List<PeerSettingInfo> = emptyList()
 
@@ -34,7 +43,12 @@ class PeerDetailsViewModel(val nodeId: StableNodeID, val filesDir: File) : IpnVi
   val connectedColor: Color
 
   init {
+    viewModelScope.launch {
+      Notifier.netmap.collect { netmap -> selfPeerId.set(netmap?.SelfNode?.StableID ?: "") }
+    }
+
     val peer = Notifier.netmap.value?.getPeer(nodeId)
+
     peer?.Addresses?.let { addresses = it.map { addr -> DisplayAddress(addr) } }
 
     peer?.Name?.let { addresses = listOf(DisplayAddress(it)) + addresses }
@@ -47,7 +61,15 @@ class PeerDetailsViewModel(val nodeId: StableNodeID, val filesDir: File) : IpnVi
     }
 
     nodeName = peer?.ComputedName ?: ""
-    connectedStrRes = if (peer?.Online == true) R.string.connected else R.string.not_connected
-    connectedColor = if (peer?.Online == true) ts_color_light_green else Color.Gray
+
+    val stateVal = Notifier.state
+    val selfPeer = selfPeerId.value
+
+    val isSelfAndRunning =
+        (peer != null && peer.StableID == selfPeer && stateVal.value == Ipn.State.Running)
+    connectedStrRes =
+        if (peer?.Online == true || isSelfAndRunning) R.string.connected else R.string.not_connected
+    connectedColor =
+        if (peer?.Online == true || isSelfAndRunning) ts_color_light_green else Color.Gray
   }
 }