diff --git a/src/chrome/DevicesButton.tsx b/src/chrome/DevicesButton.tsx
index c7836cf25..399e37c8f 100644
--- a/src/chrome/DevicesButton.tsx
+++ b/src/chrome/DevicesButton.tsx
@@ -77,15 +77,13 @@ class DevicesButton extends Component<Props> {
     let icon = 'minus-circle';
 
     if (selectedDevice && selectedDevice.isArchived) {
-      buttonLabel = `${selectedDevice.title || 'Unknown device'} ${
-        selectedDevice.source ? '(imported)' : '(offline)'
-      }`;
+      buttonLabel = `${selectedDevice.displayTitle() || 'Unknown device'}`;
       icon = 'box';
     } else if (selectedDevice && selectedDevice.deviceType === 'physical') {
-      buttonLabel = selectedDevice.title || 'Unknown device';
+      buttonLabel = selectedDevice.displayTitle() || 'Unknown device';
       icon = 'mobile';
     } else if (selectedDevice && selectedDevice.deviceType === 'emulator') {
-      buttonLabel = selectedDevice.title || 'Unknown emulator';
+      buttonLabel = selectedDevice.displayTitle() || 'Unknown emulator';
       icon = 'desktop';
     }
 
@@ -102,7 +100,7 @@ class DevicesButton extends Component<Props> {
         .map((device: BaseDevice) => ({
           click: () => selectDevice(device),
           checked: device === selectedDevice,
-          label: `📱 ${device.title}`,
+          label: `📱 ${device.displayTitle()}`,
           type: 'checkbox',
         })),
     ];
@@ -120,7 +118,7 @@ class DevicesButton extends Component<Props> {
         .map((device: BaseDevice) => ({
           click: () => selectDevice(device),
           checked: device === selectedDevice,
-          label: device.title,
+          label: device.displayTitle(),
           type: 'checkbox',
         })),
     ];
@@ -138,9 +136,7 @@ class DevicesButton extends Component<Props> {
         .map((device: BaseDevice) => ({
           click: () => selectDevice(device),
           checked: device === selectedDevice,
-          label: `📦 ${device.title} ${
-            device.source ? '(imported)' : '(offline)'
-          }`,
+          label: `📦 ${device.displayTitle()}`,
           type: 'checkbox',
         })),
     ];
diff --git a/src/chrome/mainsidebar/MainSidebar2.tsx b/src/chrome/mainsidebar/MainSidebar2.tsx
index cdd1d397a..c3f085f07 100644
--- a/src/chrome/mainsidebar/MainSidebar2.tsx
+++ b/src/chrome/mainsidebar/MainSidebar2.tsx
@@ -250,12 +250,9 @@ class MainSidebar2 extends PureComponent<Props, State> {
       selectedDevice,
     } = this.props;
     const clients = getAvailableClients(device, this.props.clients);
-
     return (
       <SidebarSection
-        title={`${device.title} ${
-          device.isArchived ? (device.source ? '(imported)' : '(offline)') : ''
-        }`}
+        title={device.displayTitle()}
         key={device.serial}
         level={1}
         defaultCollapsed={!canBeDefaultDevice(device)}>
diff --git a/src/devices/ArchivedDevice.tsx b/src/devices/ArchivedDevice.tsx
index ca0a234d3..d8ef642a3 100644
--- a/src/devices/ArchivedDevice.tsx
+++ b/src/devices/ArchivedDevice.tsx
@@ -41,6 +41,10 @@ export default class ArchivedDevice extends BaseDevice {
 
   isArchived = true;
 
+  displayTitle(): string {
+    return `${this.title} ${this.source ? '(Imported)' : '(Offline)'}`;
+  }
+
   supportRequestDetails?: SupportFormRequestDetailsState;
 
   getLogs() {
diff --git a/src/devices/BaseDevice.tsx b/src/devices/BaseDevice.tsx
index cb34d1940..deb6cf931 100644
--- a/src/devices/BaseDevice.tsx
+++ b/src/devices/BaseDevice.tsx
@@ -90,6 +90,10 @@ export default class BaseDevice {
     return os.toLowerCase() === this.os.toLowerCase();
   }
 
+  displayTitle(): string {
+    return this.title;
+  }
+
   toJSON(): DeviceExport {
     return {
       os: this.os,