diff --git a/packages/app-desktop/gui/ConfigScreen/ConfigScreen.tsx b/packages/app-desktop/gui/ConfigScreen/ConfigScreen.tsx
index 90ba1d6be..6bf703405 100644
--- a/packages/app-desktop/gui/ConfigScreen/ConfigScreen.tsx
+++ b/packages/app-desktop/gui/ConfigScreen/ConfigScreen.tsx
@@ -729,14 +729,17 @@ class ConfigScreenComponent extends React.Component<any, any> {
 			</div>
 		) : null;
 
+		const rightStyle = { ...style, flex: 1 };
+		delete style.width;
+
 		return (
-			<div style={{ display: 'flex', flexDirection: 'row' }}>
+			<div style={{ display: 'flex', flexDirection: 'row', height: this.props.style.height }}>
 				<Sidebar
 					selection={this.state.selectedSectionName}
 					onSelectionChange={this.sidebar_selectionChange}
 					sections={sections}
 				/>
-				<div style={style}>
+				<div style={rightStyle}>
 					{screenComp}
 					{needRestartComp}
 					<div style={containerStyle}>{settingComps}</div>
diff --git a/packages/app-desktop/gui/ConfigScreen/Sidebar.tsx b/packages/app-desktop/gui/ConfigScreen/Sidebar.tsx
index eefc71a0b..94a9f3e7d 100644
--- a/packages/app-desktop/gui/ConfigScreen/Sidebar.tsx
+++ b/packages/app-desktop/gui/ConfigScreen/Sidebar.tsx
@@ -15,6 +15,8 @@ export const StyledRoot = styled.div`
 	display: flex;
 	background-color: ${(props: any) => props.theme.backgroundColor2};
 	flex-direction: column;
+	overflow-x: hidden;
+	overflow-y: auto;
 `;
 
 export const StyledListItem = styled.a`