diff --git a/src/renderer/components/+cluster-settings/components/cluster-name-setting.tsx b/src/renderer/components/+cluster-settings/components/cluster-name-setting.tsx
index 749f8f215c..66590ecad3 100644
--- a/src/renderer/components/+cluster-settings/components/cluster-name-setting.tsx
+++ b/src/renderer/components/+cluster-settings/components/cluster-name-setting.tsx
@@ -32,7 +32,7 @@ export class ClusterNameSetting extends React.Component<Props> {
 
   render() {
     return (
-      <>
+      <div className="box grow">
         <SubTitle title="Name" />
         <Input
           theme="round-black"
@@ -41,7 +41,7 @@ export class ClusterNameSetting extends React.Component<Props> {
           onChange={this.onChange}
           onBlur={this.save}
         />
-      </>
+      </div>
     );
   }
 }
diff --git a/src/renderer/components/+cluster-settings/components/cluster-workspace-setting.tsx b/src/renderer/components/+cluster-settings/components/cluster-workspace-setting.tsx
index ff888f1a5c..9a1877b1bf 100644
--- a/src/renderer/components/+cluster-settings/components/cluster-workspace-setting.tsx
+++ b/src/renderer/components/+cluster-settings/components/cluster-workspace-setting.tsx
@@ -13,7 +13,7 @@ interface Props {
 export class ClusterWorkspaceSetting extends React.Component<Props> {
   render() {
     return (
-      <>
+      <div className="box grow">
         <SubTitle title="Workspace"/>
         <Select
           value={this.props.cluster.workspace}
@@ -22,7 +22,7 @@ export class ClusterWorkspaceSetting extends React.Component<Props> {
             ({value: w.id, label: w.name})
           )}
         />
-      </>
+      </div>
     );
   }
 }
diff --git a/src/renderer/components/+cluster-settings/general.tsx b/src/renderer/components/+cluster-settings/general.tsx
index 1d949275c2..cb758aefac 100644
--- a/src/renderer/components/+cluster-settings/general.tsx
+++ b/src/renderer/components/+cluster-settings/general.tsx
@@ -21,8 +21,10 @@ export class General extends React.Component<Props> {
         </section>
         <section id="cluster">
           <h2>Cluster</h2>
-          <ClusterNameSetting cluster={this.props.cluster} />
-          <ClusterWorkspaceSetting cluster={this.props.cluster} />
+          <div className="flex gaps">
+            <ClusterNameSetting cluster={this.props.cluster} />
+            <ClusterWorkspaceSetting cluster={this.props.cluster} />
+          </div>
           <ClusterIconSetting cluster={this.props.cluster} />
         </section>
         <section id="proxy">