diff --git a/packages/uhk-web/src/app/components/popover/tab/device/device-tab.component.ts b/packages/uhk-web/src/app/components/popover/tab/device/device-tab.component.ts
index f28fc856c3f..55f07bc7730 100644
--- a/packages/uhk-web/src/app/components/popover/tab/device/device-tab.component.ts
+++ b/packages/uhk-web/src/app/components/popover/tab/device/device-tab.component.ts
@@ -178,7 +178,7 @@ export class DeviceTabComponent extends Tab implements OnChanges, OnDestroy, OnI
                 const name = hostConnection.name || 'unassigned';
 
                 return {
-                    name: `${index}: ${name}`,
+                    name: `${index + 1}: ${name}`,
                     command: ConnectionCommands.switchByHostConnectionId,
                     connectionId: index,
                 }
diff --git a/packages/uhk-web/src/app/components/svg/keys/svg-keyboard-key/svg-keyboard-key.component.ts b/packages/uhk-web/src/app/components/svg/keys/svg-keyboard-key/svg-keyboard-key.component.ts
index c684b0fd288..729d1c47fc3 100644
--- a/packages/uhk-web/src/app/components/svg/keys/svg-keyboard-key/svg-keyboard-key.component.ts
+++ b/packages/uhk-web/src/app/components/svg/keys/svg-keyboard-key/svg-keyboard-key.component.ts
@@ -537,7 +537,7 @@ export class SvgKeyboardKeyComponent implements OnChanges, OnDestroy {
                 text = 'Previous'
             }
             else {
-                iconText = this.keyAction.hostConnectionId.toString(10);
+                iconText = (this.keyAction.hostConnectionId + 1).toString(10);
                 const hostConnection = this.hostConnections[this.keyAction.hostConnectionId];
                 text = hostConnection?.name || 'unassigned'
             }