diff --git a/app/src/common/AppHeader.tsx b/app/src/common/AppHeader.tsx
index faac142716..4bf7feb661 100644
--- a/app/src/common/AppHeader.tsx
+++ b/app/src/common/AppHeader.tsx
@@ -105,7 +105,7 @@ export function AppHeader() {
 
     const renderDirectionSwitcher = () => {
         return (
-            <FlexRow padding="12">
+            <FlexRow padding="12" key="RTL-switcher">
                 <MultiSwitch value={ direction } onValueChange={ changeContentDirection } items={ [{ id: 'ltr', caption: 'LTR' }, { id: 'rtl', caption: 'RTL' }] } />
             </FlexRow>
         );
@@ -233,13 +233,14 @@ export function AppHeader() {
                                 <DropdownMenuButton caption="EPAM Team (employee only)" href="https://www.figma.com/design/M5Njgc6SQJ3TPUccp5XHQx/UUI-Components?m=auto&t=qiBDEE9slwMV4paI-6" target="_blank" />
                             </DropdownMenuBody>
                         ) }
+                        key="figma-source"
                     />
                 ),
             },
             {
                 id: 'git',
                 priority: 4,
-                render: () => <MainMenuButton icon={ GitIcon } href={ GIT_LINK } target="_blank" cx={ cx(css.icon) } />,
+                render: () => <MainMenuButton icon={ GitIcon } href={ GIT_LINK } target="_blank" cx={ cx(css.icon) } key="github-link" />,
             },
             {
                 id: 'gitStar',
diff --git a/changelog.md b/changelog.md
index 9ac3744845..e67868ca94 100644
--- a/changelog.md
+++ b/changelog.md
@@ -9,6 +9,7 @@
 
 **What's Fixed**
 * [Text]: fixed bug when passed rawProps override Text internal styles
+* [Modals]: fixed value for default modal width
 
 # 5.10.1 - 16.10.2024
 
diff --git a/uui/components/overlays/__tests__/__snapshots__/Modals.test.tsx.snap b/uui/components/overlays/__tests__/__snapshots__/Modals.test.tsx.snap
index 1ed820157e..0274d640d2 100644
--- a/uui/components/overlays/__tests__/__snapshots__/Modals.test.tsx.snap
+++ b/uui/components/overlays/__tests__/__snapshots__/Modals.test.tsx.snap
@@ -114,7 +114,7 @@ exports[`Modals should be rendered correctly with minimum props 1`] = `
       Object {
         "height": "auto",
         "maxHeight": "80dvh",
-        "width": "420",
+        "width": 420,
       }
     }
   >
diff --git a/uui/settings.ts b/uui/settings.ts
index 9169ab22a7..40f8d96366 100644
--- a/uui/settings.ts
+++ b/uui/settings.ts
@@ -267,7 +267,7 @@ export const settings: Settings = {
         modal: {
             window: {
                 defaults: {
-                    width: '420',
+                    width: 420,
                 },
             },
         },
diff --git a/uui/settings.types.ts b/uui/settings.types.ts
index 97502a6306..da7941bd82 100644
--- a/uui/settings.types.ts
+++ b/uui/settings.types.ts
@@ -221,7 +221,7 @@ interface TabButtonSizes {
 }
 
 interface ModalWindowDefaultSizes {
-    width: string;
+    width: number;
 }
 
 interface ModalWindowSizes {