diff --git a/syncthing_gtk/deviceeditor.py b/syncthing_gtk/deviceeditor.py
index 3adece44..ce4de003 100644
--- a/syncthing_gtk/deviceeditor.py
+++ b/syncthing_gtk/deviceeditor.py
@@ -116,15 +116,10 @@ def on_save_reuqested(self):
 	#@Overrides
 	def store_value(self, key, w):
 		if key == "vaddresses":
-			addresses = w.get_text().strip()
-			if addresses == "dynamic":
-				# Special case
-				self.set_value("addresses", "dynamic")
-			else:
-				addresses = [
-					x.strip() if "://" in x else "tcp://%s" % (x.strip(),)
-					for x in addresses.split(",") ]
-				self.set_value("addresses", ",".join(addresses))
+			addresses = [
+				x.strip() if "://" in x or x.strip() == "dynamic" else "tcp://%s" % (x.strip(),)
+				for x in w.get_text().split(",") ]
+			self.set_value("addresses", ",".join(addresses))
 		elif key == "vfolders":
 			# Generate dict of { folder_id : bool } where bool is True if
 			# folder should be shared with this device