diff --git a/web/ASC.Web.Client/src/components/pages/Wizard/sub-components/settings-container.js b/web/ASC.Web.Client/src/components/pages/Wizard/sub-components/settings-container.js
index 5c0c08155d..c90abdeb07 100644
--- a/web/ASC.Web.Client/src/components/pages/Wizard/sub-components/settings-container.js
+++ b/web/ASC.Web.Client/src/components/pages/Wizard/sub-components/settings-container.js
@@ -80,33 +80,35 @@ const SettingsContainer = ({
 
       <Text fontSize="13px">{t('language')}</Text>
       <ComboBox 
-          className="drop-down" 
-          options={languages}
-          selectedOption={{
-            key: selectLanguage.key,
-            label: selectLanguage.label
-          }} 
-          noBorder={true}
-          scaled={false}
-          size='content'
-          dropDownMaxHeight={300} 
-          onSelect={onSelectLanguageHandler}
-        />
+        className="drop-down" 
+        options={languages}
+        selectedOption={{
+          key: selectLanguage.key,
+          label: selectLanguage.label
+        }} 
+        noBorder={true}
+        scaled={false}
+        size='content'
+        dropDownMaxHeight={300} 
+        onSelect={onSelectLanguageHandler}
+        textOverflow={true}
+      />
 
       <Text className="title" fontSize="13px">{t('timezone')}</Text>
       <ComboBox 
-          className="drop-down"
-          options={timezones}
-          selectedOption={{
-            key: selectTimezone.key,
-            label: selectTimezone.label 
-          }}
-          noBorder={true}
-          dropDownMaxHeight={300}
-          scaled={false}
-          size='content'
-          onSelect={onSelectTimezoneHandler}
-        />
+        className="drop-down"
+        options={timezones}
+        selectedOption={{
+          key: selectTimezone.key,
+          label: selectTimezone.label 
+        }}
+        noBorder={true}
+        dropDownMaxHeight={300}
+        scaled={false}
+        size='content'
+        onSelect={onSelectTimezoneHandler}
+        textOverflow={true}
+      />
   
     </StyledContainer>
   );
diff --git a/web/ASC.Web.Components/src/components/combobox/index.js b/web/ASC.Web.Components/src/components/combobox/index.js
index db0a21238a..9657b4ed1d 100644
--- a/web/ASC.Web.Components/src/components/combobox/index.js
+++ b/web/ASC.Web.Components/src/components/combobox/index.js
@@ -97,7 +97,8 @@ class ComboBox extends React.Component {
       noBorder,
       scaledOptions,
       displayType,
-      toggleAction } = this.props;
+      toggleAction,
+      textOverflow } = this.props;
     const { isOpen, selectedOption } = this.state;
 
     const dropDownMaxHeightProp = dropDownMaxHeight
@@ -156,6 +157,7 @@ class ComboBox extends React.Component {
               ? advancedOptions
               : options.map((option) =>
                 <DropDownItem {...option}
+                  textOverflow={textOverflow}
                   key={option.key}
                   disabled={
                     option.disabled
@@ -189,7 +191,8 @@ ComboBox.propTypes = {
   selectedOption: PropTypes.object.isRequired,
   size: PropTypes.oneOf(['base', 'middle', 'big', 'huge', 'content']),
   style: PropTypes.oneOfType([PropTypes.object, PropTypes.array]),
-  toggleAction: PropTypes.func
+  toggleAction: PropTypes.func,
+  textOverflow: PropTypes.bool
 }
 
 ComboBox.defaultProps = {
diff --git a/web/ASC.Web.Components/src/components/drop-down-item/index.js b/web/ASC.Web.Components/src/components/drop-down-item/index.js
index 3cd85c14e7..414b9cdfe3 100644
--- a/web/ASC.Web.Components/src/components/drop-down-item/index.js
+++ b/web/ASC.Web.Components/src/components/drop-down-item/index.js
@@ -25,7 +25,7 @@ const disabledAndHeaderStyle = css`
 `;
 
 const StyledDropdownItem = styled.div`
-    display: flex;
+    display:${props => props.textOverflow ? "block" : "flex"};
     width: 100%;
     max-width: 500px;
     border: 0px;
@@ -127,7 +127,8 @@ DropDownItem.propTypes = {
   children: PropTypes.any,
   className: PropTypes.string,
   id: PropTypes.string,
-  style: PropTypes.oneOfType([PropTypes.object, PropTypes.array])
+  style: PropTypes.oneOfType([PropTypes.object, PropTypes.array]),
+  textOverflow: PropTypes.bool
 };
 
 DropDownItem.defaultProps = {
@@ -136,7 +137,8 @@ DropDownItem.defaultProps = {
   tabIndex: -1,
   label: '',
   disabled: false,
-  noHover: false
+  noHover: false,
+  textOverflow: false
 };
 
 export default DropDownItem
\ No newline at end of file