diff --git a/web/modals/threads/color-selector.css b/web/modals/threads/color-selector.css
index a56391278..fb4231e8a 100644
--- a/web/modals/threads/color-selector.css
+++ b/web/modals/threads/color-selector.css
@@ -1,14 +1,11 @@
 div.container {
-  display: flex;
-  flex-direction: column;
-  width: 100%;
-}
-
-div.row {
   display: flex;
   flex-direction: row;
+  flex-wrap: wrap;
   align-items: center;
-  justify-content: space-between;
+  justify-content: center;
+  column-gap: 12px;
+  row-gap: 6px;
   width: 100%;
   padding: 6px 0;
 }
diff --git a/web/modals/threads/color-selector.react.js b/web/modals/threads/color-selector.react.js
index 202b2f8ed..74c5f9dd0 100644
--- a/web/modals/threads/color-selector.react.js
+++ b/web/modals/threads/color-selector.react.js
@@ -1,77 +1,73 @@
 // @flow
 
 import * as React from 'react';
 
 import { selectedThreadColors } from 'lib/shared/thread-utils';
 
 import ColorSelectorButton from './color-selector-button.react';
 import css from './color-selector.css';
 
 type ColorSelectorProps = {
   +currentColor: string,
   +onColorSelection: (hex: string) => void,
 };
 function ColorSelector(props: ColorSelectorProps): React.Node {
   const { currentColor, onColorSelection } = props;
 
   return (
     <div className={css.container}>
-      <div className={css.row}>
-        <ColorSelectorButton
-          color={selectedThreadColors[0]}
-          currentColor={currentColor}
-          onColorSelection={onColorSelection}
-        />
-        <ColorSelectorButton
-          color={selectedThreadColors[1]}
-          currentColor={currentColor}
-          onColorSelection={onColorSelection}
-        />
-        <ColorSelectorButton
-          color={selectedThreadColors[2]}
-          currentColor={currentColor}
-          onColorSelection={onColorSelection}
-        />
-        <ColorSelectorButton
-          color={selectedThreadColors[3]}
-          currentColor={currentColor}
-          onColorSelection={onColorSelection}
-        />
-        <ColorSelectorButton
-          color={selectedThreadColors[4]}
-          currentColor={currentColor}
-          onColorSelection={onColorSelection}
-        />
-      </div>
-      <div className={css.row}>
-        <ColorSelectorButton
-          color={selectedThreadColors[5]}
-          currentColor={currentColor}
-          onColorSelection={onColorSelection}
-        />
-        <ColorSelectorButton
-          color={selectedThreadColors[6]}
-          currentColor={currentColor}
-          onColorSelection={onColorSelection}
-        />
-        <ColorSelectorButton
-          color={selectedThreadColors[7]}
-          currentColor={currentColor}
-          onColorSelection={onColorSelection}
-        />
-        <ColorSelectorButton
-          color={selectedThreadColors[8]}
-          currentColor={currentColor}
-          onColorSelection={onColorSelection}
-        />
-        <ColorSelectorButton
-          color={selectedThreadColors[9]}
-          currentColor={currentColor}
-          onColorSelection={onColorSelection}
-        />
-      </div>
+      <ColorSelectorButton
+        color={selectedThreadColors[0]}
+        currentColor={currentColor}
+        onColorSelection={onColorSelection}
+      />
+      <ColorSelectorButton
+        color={selectedThreadColors[1]}
+        currentColor={currentColor}
+        onColorSelection={onColorSelection}
+      />
+      <ColorSelectorButton
+        color={selectedThreadColors[2]}
+        currentColor={currentColor}
+        onColorSelection={onColorSelection}
+      />
+      <ColorSelectorButton
+        color={selectedThreadColors[3]}
+        currentColor={currentColor}
+        onColorSelection={onColorSelection}
+      />
+      <ColorSelectorButton
+        color={selectedThreadColors[4]}
+        currentColor={currentColor}
+        onColorSelection={onColorSelection}
+      />
+      <ColorSelectorButton
+        color={selectedThreadColors[5]}
+        currentColor={currentColor}
+        onColorSelection={onColorSelection}
+      />
+      <ColorSelectorButton
+        color={selectedThreadColors[6]}
+        currentColor={currentColor}
+        onColorSelection={onColorSelection}
+      />
+      <ColorSelectorButton
+        color={selectedThreadColors[7]}
+        currentColor={currentColor}
+        onColorSelection={onColorSelection}
+      />
+      <ColorSelectorButton
+        color={selectedThreadColors[8]}
+        currentColor={currentColor}
+        onColorSelection={onColorSelection}
+      />
+      <ColorSelectorButton
+        color={selectedThreadColors[9]}
+        currentColor={currentColor}
+        onColorSelection={onColorSelection}
+      />
     </div>
   );
 }
 
 export default ColorSelector;