diff --git a/retroshare-gui/src/gui/common/StatusDefs.cpp b/retroshare-gui/src/gui/common/StatusDefs.cpp
index 954d1413d..0d2033519 100644
--- a/retroshare-gui/src/gui/common/StatusDefs.cpp
+++ b/retroshare-gui/src/gui/common/StatusDefs.cpp
@@ -183,18 +183,23 @@ QString StatusDefs::connectStateString(RsPeerDetails &details)
 		break;
 	}
 
-	if (details.connectStateString.empty() == false) {
-		if (stateString.isEmpty() == false) {
-			stateString += ": ";
-		}
+	if (!details.connectStateString.empty())
+	{
+		if (!stateString.isEmpty()) stateString += ": ";
 		stateString += QString::fromStdString(details.connectStateString);
 	}
+	else if (!details.connectAddr.empty())
+	{
+		if (!stateString.isEmpty()) stateString += ": [";
+		stateString += QString::fromStdString(details.connectAddr);
+		stateString += "]:";
+		stateString += QString::number(details.connectPort);
+	}
 
 	/* HACK to display DHT Status info too */
-	if (details.foundDHT) {
-		if (stateString.isEmpty() == false) {
-			stateString += ", ";
-		}
+	if (details.foundDHT)
+	{
+		if (!stateString.isEmpty()) stateString += ", ";
 		stateString += qApp->translate("StatusDefs", "DHT: Contact");
 	}