diff --git a/Meshtastic/Views/Nodes/Helpers/NodeInfoItem.swift b/Meshtastic/Views/Nodes/Helpers/NodeInfoItem.swift
index 46aae43b..1c9739b0 100644
--- a/Meshtastic/Views/Nodes/Helpers/NodeInfoItem.swift
+++ b/Meshtastic/Views/Nodes/Helpers/NodeInfoItem.swift
@@ -32,7 +32,8 @@ struct NodeInfoItem: View {
 						.frame(width: 75, height: 75)
 						.cornerRadius(5)
 					Text(String(node.user!.hwModel ?? "unset".localized))
-						.font(.caption2).fixedSize()
+						.font(.caption2)
+						.frame(maxWidth: 125)
 				}
 			}
 			if node.snr != 0 && !node.viaMqtt {
diff --git a/Meshtastic/Views/Settings/Config/DeviceConfig.swift b/Meshtastic/Views/Settings/Config/DeviceConfig.swift
index 79ccc933..c4256f58 100644
--- a/Meshtastic/Views/Settings/Config/DeviceConfig.swift
+++ b/Meshtastic/Views/Settings/Config/DeviceConfig.swift
@@ -313,6 +313,7 @@ struct DeviceConfig: View {
 		self.doubleTapAsButtonPress = node?.deviceConfig?.doubleTapAsButtonPress ?? false
 		self.ledHeartbeatEnabled = node?.deviceConfig?.ledHeartbeatEnabled ?? true
 		self.isManaged = node?.deviceConfig?.isManaged ?? false
+		self.tzdef = node?.deviceConfig?.tzdef ?? ""
 		if self.tzdef.isEmpty {
 			self.tzdef = TimeZone.current.posixDescription
 			self.hasChanges = true