diff --git a/ui-ngx/src/app/modules/home/components/iot-hub/iot-hub-install-dialog.component.ts b/ui-ngx/src/app/modules/home/components/iot-hub/iot-hub-install-dialog.component.ts
index 17f8b13c3f..b9391e2240 100644
--- a/ui-ngx/src/app/modules/home/components/iot-hub/iot-hub-install-dialog.component.ts
+++ b/ui-ngx/src/app/modules/home/components/iot-hub/iot-hub-install-dialog.component.ts
@@ -96,7 +96,8 @@ export class TbIotHubInstallDialogComponent extends DialogComponent<TbIotHubInst
               this.dialogRef.close('installed');
               this.dialog.open(SolutionInstallDialogComponent, {
                 disableClose: true,
-                panelClass: 'tb-solution-install-dialog-panel',
+                autoFocus: false,
+                panelClass: ['tb-dialog', 'tb-fullscreen-dialog'],
                 data: { descriptor: result.descriptor as SolutionTemplateInstalledItemDescriptor }
               });
             };
diff --git a/ui-ngx/src/app/modules/home/components/iot-hub/iot-hub-item-detail-dialog.component.ts b/ui-ngx/src/app/modules/home/components/iot-hub/iot-hub-item-detail-dialog.component.ts
index 65bcd0e645..08dd33dbf2 100644
--- a/ui-ngx/src/app/modules/home/components/iot-hub/iot-hub-item-detail-dialog.component.ts
+++ b/ui-ngx/src/app/modules/home/components/iot-hub/iot-hub-item-detail-dialog.component.ts
@@ -341,7 +341,8 @@ export class TbIotHubItemDetailDialogComponent extends DialogComponent<TbIotHubI
     if (descriptor?.type === 'SOLUTION_TEMPLATE') {
       this.dialog.open(SolutionInstallDialogComponent, {
         disableClose: true,
-        panelClass: 'tb-solution-install-dialog-panel',
+        autoFocus: false,
+        panelClass: ['tb-dialog', 'tb-fullscreen-dialog'],
         data: {
           descriptor: descriptor as SolutionTemplateInstalledItemDescriptor,
           instructions: true
diff --git a/ui-ngx/src/app/modules/home/components/iot-hub/iot-hub-update-dialog.component.ts b/ui-ngx/src/app/modules/home/components/iot-hub/iot-hub-update-dialog.component.ts
index 226ddeef4a..acb78672a0 100644
--- a/ui-ngx/src/app/modules/home/components/iot-hub/iot-hub-update-dialog.component.ts
+++ b/ui-ngx/src/app/modules/home/components/iot-hub/iot-hub-update-dialog.component.ts
@@ -81,7 +81,8 @@ export class TbIotHubUpdateDialogComponent extends DialogComponent<TbIotHubUpdat
             this.dialogRef.close('updated');
             this.dialog.open(SolutionInstallDialogComponent, {
               disableClose: true,
-              panelClass: 'tb-solution-install-dialog-panel',
+              autoFocus: false,
+              panelClass: ['tb-dialog', 'tb-fullscreen-dialog'],
               data: { descriptor: result.descriptor as SolutionTemplateInstalledItemDescriptor }
             });
           } else {
diff --git a/ui-ngx/src/app/modules/home/components/solution/solution-install-dialog.component.scss b/ui-ngx/src/app/modules/home/components/solution/solution-install-dialog.component.scss
index 9b95152b86..d1af6f174c 100644
--- a/ui-ngx/src/app/modules/home/components/solution/solution-install-dialog.component.scss
+++ b/ui-ngx/src/app/modules/home/components/solution/solution-install-dialog.component.scss
@@ -14,6 +14,8 @@
  * limitations under the License.
  */
 
+@import "../../../../../scss/constants";
+
 :host {
   h2 {
     .mat-icon {
@@ -24,6 +26,17 @@
   }
 }
 
+.tb-dialog-content {
+  max-width: 100%;
+  display: flex;
+  flex-direction: column;
+
+  @media #{$mat-xs} {
+    min-width: 100% !important;
+    height: 100%;
+  }
+}
+
 :host ::ng-deep {
   .mat-mdc-dialog-content {
     tb-markdown {