diff --git a/ui-ngx/src/app/modules/home/components/device/device-credentials.component.html b/ui-ngx/src/app/modules/home/components/device/device-credentials.component.html
index 1bd319587b..fd666e1398 100644
--- a/ui-ngx/src/app/modules/home/components/device/device-credentials.component.html
+++ b/ui-ngx/src/app/modules/home/components/device/device-credentials.component.html
@@ -16,15 +16,7 @@
 
 -->
 <section [formGroup]="deviceCredentialsFormGroup">
-  <mat-form-field class="mat-block" [fxShow.xs]="credentialsTypes?.length > 1" fxHide.gt-xs>
-    <mat-label translate>device.credentials-type</mat-label>
-    <mat-select formControlName="credentialsType">
-      <mat-option *ngFor="let credentialsType of credentialsTypes" [value]="credentialsType">
-        {{ credentialTypeNamesMap.get(credentialsType) }}
-      </mat-option>
-    </mat-select>
-  </mat-form-field>
-  <section [fxShow.gt-xs]="credentialsTypes?.length > 1" fxHide.xs style="margin-bottom: 16px">
+  <section [fxShow]="credentialsTypes?.length > 1" style="margin-bottom: 16px">
     <div class="tb-type-title" translate>device.credentials-type</div>
     <tb-toggle-select formControlName="credentialsType" appearance="fill">
       <tb-toggle-option *ngFor="let credentialsType of credentialsTypes" [value]="credentialsType">
diff --git a/ui-ngx/src/app/modules/home/components/wizard/device-wizard-dialog.component.html b/ui-ngx/src/app/modules/home/components/wizard/device-wizard-dialog.component.html
index be6caba2ab..cc1aa3235c 100644
--- a/ui-ngx/src/app/modules/home/components/wizard/device-wizard-dialog.component.html
+++ b/ui-ngx/src/app/modules/home/components/wizard/device-wizard-dialog.component.html
@@ -79,9 +79,9 @@
               {{ 'device.overwrite-activity-time' | translate }}
             </mat-slide-toggle>
           </div>
-          <mat-form-field class="mat-block">
+          <mat-form-field class="mat-block" subscriptSizing="dynamic">
             <mat-label translate>device.description</mat-label>
-            <textarea matInput formControlName="description" rows="2"></textarea>
+            <textarea matInput formControlName="description" rows="1"></textarea>
           </mat-form-field>
         </fieldset>
       </form>