diff --git a/ui-ngx/src/app/modules/home/components/iot-hub/device-install-dialog/device-install-dialog.component.html b/ui-ngx/src/app/modules/home/components/iot-hub/device-install-dialog/device-install-dialog.component.html
index 2b950ce9b2..9f59507941 100644
--- a/ui-ngx/src/app/modules/home/components/iot-hub/device-install-dialog/device-install-dialog.component.html
+++ b/ui-ngx/src/app/modules/home/components/iot-hub/device-install-dialog/device-install-dialog.component.html
@@ -60,8 +60,9 @@
     <!-- Stepper wizard -->
     <div class="tb-device-install-stepper-container">
       <mat-horizontal-stepper #installStepper
-                              [linear]="true"
-                              labelPosition="bottom">
+                              [linear]="!reviewMode"
+                              labelPosition="bottom"
+                              (selectionChange)="onStepChanged()">
         <ng-template matStepperIcon="edit">
           <mat-icon>done</mat-icon>
         </ng-template>
diff --git a/ui-ngx/src/app/modules/home/components/iot-hub/device-install-dialog/device-install-dialog.component.ts b/ui-ngx/src/app/modules/home/components/iot-hub/device-install-dialog/device-install-dialog.component.ts
index 9ee8e11ef9..403777bfe0 100644
--- a/ui-ngx/src/app/modules/home/components/iot-hub/device-install-dialog/device-install-dialog.component.ts
+++ b/ui-ngx/src/app/modules/home/components/iot-hub/device-install-dialog/device-install-dialog.component.ts
@@ -186,6 +186,10 @@ export class TbDeviceInstallDialogComponent extends DialogComponent<TbDeviceInst
     this.selectedConnectivity = ct;
   }
 
+  onStepChanged(): void {
+    this.onStepActivated();
+  }
+
   confirmConnectivity(): void {
     if (!this.selectedConnectivity) {
       return;