diff --git a/res/css/components/views/settings/shared/_SettingsSubsection.pcss b/res/css/components/views/settings/shared/_SettingsSubsection.pcss
index 9ab33c9353..6d4b69e292 100644
--- a/res/css/components/views/settings/shared/_SettingsSubsection.pcss
+++ b/res/css/components/views/settings/shared/_SettingsSubsection.pcss
@@ -34,7 +34,9 @@ limitations under the License.
     width: 100%;
     display: grid;
     grid-gap: $spacing-8;
-    grid-template-columns: 1fr;
+    // setting minwidth 0 makes columns definitely sized
+    // fixing horizontal overflow
+    grid-template-columns: minmax(0, 1fr);
     justify-items: flex-start;
     margin-top: $spacing-24;
 
diff --git a/res/css/views/settings/_LayoutSwitcher.pcss b/res/css/views/settings/_LayoutSwitcher.pcss
index be07573a52..94952e31b6 100644
--- a/res/css/views/settings/_LayoutSwitcher.pcss
+++ b/res/css/views/settings/_LayoutSwitcher.pcss
@@ -19,6 +19,7 @@ limitations under the License.
     display: flex;
     flex-direction: row;
     gap: 24px;
+    width: 100%;
 
     color: $primary-content;