diff --git a/ui-ngx/src/app/modules/home/components/dashboard-page/dashboard-page.component.scss b/ui-ngx/src/app/modules/home/components/dashboard-page/dashboard-page.component.scss
index d8d1de2905..09ba2d7f95 100644
--- a/ui-ngx/src/app/modules/home/components/dashboard-page/dashboard-page.component.scss
+++ b/ui-ngx/src/app/modules/home/components/dashboard-page/dashboard-page.component.scss
@@ -125,7 +125,11 @@ div.tb-dashboard-page {
     mat-drawer-container.tb-dashboard-layouts {
       width: 100%;
       &.tb-shrinked {
-        width: 40%;
+        width: max(40%, calc(100% - 956px));
+
+        @media screen and (min-width: 2000px) {
+          width: max(40%, calc(100% - 1192px));
+        }
       }
     }
 
@@ -135,11 +139,11 @@ div.tb-dashboard-page {
       }
 
       @media #{$mat-gt-md} {
-        width: 75% !important;
+        width: min(85%, 956px) !important;
       }
 
-      @media #{$mat-gt-xl} {
-        width: 60% !important;
+      @media screen and (min-width: 2000px) {
+        width: min(60%, 1192px) !important;
       }
     }
   }
diff --git a/ui-ngx/src/app/modules/home/components/dashboard-page/dashboard-widget-select.component.ts b/ui-ngx/src/app/modules/home/components/dashboard-page/dashboard-widget-select.component.ts
index 149a64b856..7e8f31578b 100644
--- a/ui-ngx/src/app/modules/home/components/dashboard-page/dashboard-widget-select.component.ts
+++ b/ui-ngx/src/app/modules/home/components/dashboard-page/dashboard-widget-select.component.ts
@@ -142,8 +142,10 @@ export class DashboardWidgetSelectComponent implements OnInit {
     columns: 2,
     breakpoints: {
       'screen and (min-width: 2000px)': 5,
-      'gt-md': 4,
-      'gt-xs': 3
+      'screen and (min-width: 1097px)': 4,
+      'gt-sm': 3,
+      'screen and (min-width: 721px)': 4,
+      'screen and (min-width: 485px)': 3
     }
   };