diff --git a/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-home.component.html b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-home.component.html
index a0cdf0a107..6857e3ba01 100644
--- a/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-home.component.html
+++ b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-home.component.html
@@ -57,7 +57,7 @@
                 (mouseleave)="onHeroTypeLeave()">{{ ht.labelKey | translate }}@if (!last) {,}</span>
         }
       </div>
-      <mat-form-field appearance="outline" class="tb-iot-hub-hero-search" #searchField>
+      <mat-form-field appearance="outline" class="tb-iot-hub-hero-search" subscriptSizing="dynamic" #searchField>
         <input matInput #searchInput
                [placeholder]="'iot-hub.search-placeholder' | translate"
                [(ngModel)]="searchText"
diff --git a/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-home.component.scss b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-home.component.scss
index c86ec1202c..0cd5fdbf9c 100644
--- a/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-home.component.scss
+++ b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-home.component.scss
@@ -214,10 +214,6 @@
       0 114px 46px 0 rgba(0, 0, 0, 0.01),
       0 178px 50px 0 rgba(0, 0, 0, 0);
   }
-
-  .mat-mdc-form-field-subscript-wrapper {
-    display: none;
-  }
 }
 
 // Search popup panel (mat-autocomplete overlay)
diff --git a/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-search.component.html b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-search.component.html
index 577ad0873a..7abbdf769d 100644
--- a/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-search.component.html
+++ b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-search.component.html
@@ -33,7 +33,7 @@
 
   <!-- Search + Sort row -->
   <div class="tb-search-toolbar">
-    <mat-form-field appearance="outline" class="tb-search-input-field">
+    <mat-form-field appearance="outline" class="tb-search-input-field" subscriptSizing="dynamic">
       <input matInput
              [(ngModel)]="searchText"
              (input)="onSearchInput()"
@@ -79,12 +79,12 @@
           </button>
         </div>
         <div class="tb-search-page-size">
-          <span>{{ 'iot-hub.items-per-page' | translate }}</span>
-          <select [ngModel]="pageSize" (ngModelChange)="onPageSizeChange($event)">
+          <span>{{ 'iot-hub.items-per-page' | translate }}:</span>
+          <mat-select [value]="pageSize" (selectionChange)="onPageSizeChange($event.value)" class="tb-search-page-size-select">
             @for (size of pageSizeOptions; track size) {
-              <option [value]="size">{{ size }}</option>
+              <mat-option [value]="size">{{ size }}</mat-option>
             }
-          </select>
+          </mat-select>
         </div>
       </div>
     </div>
diff --git a/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-search.component.scss b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-search.component.scss
index 4c990d652a..4dbed2491e 100644
--- a/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-search.component.scss
+++ b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-search.component.scss
@@ -33,7 +33,6 @@
 // Back button
 .tb-search-back-btn {
   align-self: flex-start;
-  margin-bottom: -20px;
 }
 
 // Title — Design: 28px Medium, black-primary
@@ -63,10 +62,6 @@
   ::ng-deep .mat-mdc-text-field-wrapper {
     border-radius: 8px;
   }
-
-  .mat-mdc-form-field-subscript-wrapper {
-    display: none;
-  }
 }
 
 .tb-search-sort-btn {
@@ -133,18 +128,22 @@
   align-items: center;
   gap: 8px;
   font-size: 14px;
+  font-weight: 400;
+  line-height: 20px;
+  letter-spacing: 0.2px;
   color: rgba(0, 0, 0, 0.76);
+  margin-left: auto;
+}
+
+.tb-search-page-size-select {
+  width: 77px;
+  height: 40px;
+  border: 1px solid rgba(0, 0, 0, 0.12);
+  border-radius: 4px;
+  padding: 6px 12px;
 
-  select {
-    width: 77px;
-    height: 40px;
-    border: 1px solid rgba(0, 0, 0, 0.12);
-    border-radius: 4px;
-    padding: 8px 12px;
+  ::ng-deep .mat-mdc-select-trigger {
     font-size: 14px;
-    font-family: inherit;
-    background: white;
-    cursor: pointer;
   }
 }
 
diff --git a/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-search.component.ts b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-search.component.ts
index 3151912edb..039c1f25c8 100644
--- a/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-search.component.ts
+++ b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-search.component.ts
@@ -194,7 +194,8 @@ export class TbIotHubSearchComponent implements OnInit, OnDestroy {
   }
 
   navigateToType(type: ItemType): void {
-    this.router.navigate(['/iot-hub', this.getTypeRoute(type)]);
+    const search = this.searchText?.trim() || undefined;
+    this.router.navigate(['/iot-hub', this.getTypeRoute(type)], { queryParams: { search } });
   }
 
   // Installed items