diff --git a/src/components/Dialogs/_AddSegmentDialog.tsx b/src/components/Dialogs/_AddSegmentDialog.tsx
index 64ffdca9..335aa145 100644
--- a/src/components/Dialogs/_AddSegmentDialog.tsx
+++ b/src/components/Dialogs/_AddSegmentDialog.tsx
@@ -36,6 +36,7 @@ const Root = styled('div')(({ theme }) => ({
 function ConfirmationDialogRaw(props: any) {
   const { onClose, value: valueProp, open, ...other } = props
   const [value, setValue] = React.useState(valueProp)
+  const virtuals = useStore((state) => state.virtuals) || {}
 
   const handleCancel = () => {
     onClose()
@@ -71,7 +72,7 @@ function ConfirmationDialogRaw(props: any) {
                 value={props.deviceList[device].id}
                 key={props.deviceList[device].id}
               >
-                {props.deviceList[device].config.name}
+                {virtuals[props.deviceList[device].id].config.name || props.deviceList[device].config.name}
               </MenuItem>
             ))}
           </Select>
diff --git a/src/pages/Devices/EditVirtuals/Segment.tsx b/src/pages/Devices/EditVirtuals/Segment.tsx
index bccae712..4c244ba7 100644
--- a/src/pages/Devices/EditVirtuals/Segment.tsx
+++ b/src/pages/Devices/EditVirtuals/Segment.tsx
@@ -8,10 +8,11 @@ import useSegmentStyles from './Segment.styles'
 
 const Segment = ({ s, i, virtual, segments, calib }: any) => {
   const devices = useStore((state) => state.devices)
+  const virtuals = useStore((state) => state.virtuals)
 
   const title =
-    devices &&
-    devices[devices && Object.keys(devices).find((d) => d === s[0])!].config!
+    devices && virtuals &&
+    virtuals[devices && Object.keys(devices).find((d) => d === s[0])!].config!
       .name
   const classes = useSegmentStyles()
   const updateSegments = useStore((state) => state.updateSegments)