diff --git a/app/src/main/java/com/limelight/nvstream/http/ComputerDetails.java b/app/src/main/java/com/limelight/nvstream/http/ComputerDetails.java
index b41170d5..0c0cc005 100644
--- a/app/src/main/java/com/limelight/nvstream/http/ComputerDetails.java
+++ b/app/src/main/java/com/limelight/nvstream/http/ComputerDetails.java
@@ -20,6 +20,11 @@ public class ComputerDetails {
                 throw new IllegalArgumentException("Invalid port");
             }
 
+            // If this was an escaped IPv6 address, remove the brackets
+            if (address.startsWith("[") && address.endsWith("]")) {
+                address = address.substring(1, address.length() - 1);
+            }
+
             this.address = address;
             this.port = port;
         }
@@ -40,7 +45,14 @@ public class ComputerDetails {
         }
 
         public String toString() {
-            return address + ":" + port;
+            if (address.contains(":")) {
+                // IPv6
+                return "[" + address + "]:" + port;
+            }
+            else {
+                // IPv4 and hostnames
+                return address + ":" + port;
+            }
         }
     }