diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/gateway/gateway-statistics.component.html b/ui-ngx/src/app/modules/home/components/widget/lib/gateway/gateway-statistics.component.html
index 96770f9c12..5dbc0aee00 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/gateway/gateway-statistics.component.html
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/gateway/gateway-statistics.component.html
@@ -17,7 +17,7 @@
 -->
 <div class="statistics-container" fxLayout="row" fxLayout.lt-md="column">
   <mat-card [formGroup]="statisticForm" *ngIf="!general">
-    <mat-form-field class="mat-block">
+    <mat-form-field class="mat-block" subscriptSizing="dynamic">
       <mat-label>{{ 'gateway.statistics.statistic' | translate }}</mat-label>
       <mat-select formControlName="statisticKey">
         <mat-option *ngFor="let key of statisticsKeys" [value]="key">
@@ -32,9 +32,11 @@
       *ngIf="!statisticsKeys.length && !commands.length">
       {{ 'gateway.statistics.statistic-commands-empty' | translate }}
     </mat-error>
-    <button mat-flat-button class="mat-mdc-button" color="primary" (click)="navigateToStatistics()">
-      {{ 'gateway.statistics.statistics-button' | translate }}
-    </button>
+    <div>
+      <button mat-flat-button color="primary" (click)="navigateToStatistics()">
+        {{ 'gateway.statistics.statistics-button' | translate }}
+      </button>
+    </div>
     <mat-form-field class="mat-block" *ngIf="commandObj">
       <mat-label>{{ 'gateway.statistics.command' | translate }}</mat-label>
       <input matInput [value]="commandObj.command" disabled>
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/gateway/gateway-statistics.component.scss b/ui-ngx/src/app/modules/home/components/widget/lib/gateway/gateway-statistics.component.scss
index c0c8e084b1..9f719807ca 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/gateway/gateway-statistics.component.scss
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/gateway/gateway-statistics.component.scss
@@ -28,6 +28,7 @@
       height: 100%;
       margin-right: 35px;
       padding: 15px;
+      gap: 22px;
     }
 
     @media only screen and (max-width: 750px) {
@@ -36,11 +37,6 @@
       }
     }
 
-    .mat-mdc-button {
-      width: 185px;
-      margin-top: 22px;
-    }
-
     .chart-box, .chart-container {
       height: 100%;
       flex-grow: 1;
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/gateway/gateway-statistics.component.ts b/ui-ngx/src/app/modules/home/components/widget/lib/gateway/gateway-statistics.component.ts
index 1caab7a462..b17b8ef28a 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/gateway/gateway-statistics.component.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/gateway/gateway-statistics.component.ts
@@ -32,7 +32,7 @@ import { Direction, SortOrder } from '@shared/models/page/sort-order';
 import { MatTableDataSource } from '@angular/material/table';
 import { MatSort } from '@angular/material/sort';
 import { NULL_UUID } from '@shared/models/id/has-uuid';
-import {deepClone} from "@core/utils";
+import { deepClone } from '@core/utils';
 
 @Component({
   selector: 'tb-gateway-statistics',