diff --git a/src/app/shop/color-picker/color-picker-dialog/color-picker-dialog.component.html b/src/app/shop/color-picker/color-picker-dialog/color-picker-dialog.component.html
index e715b16..0c5cf52 100644
--- a/src/app/shop/color-picker/color-picker-dialog/color-picker-dialog.component.html
+++ b/src/app/shop/color-picker/color-picker-dialog/color-picker-dialog.component.html
@@ -15,7 +15,7 @@ limitations under the License.
 -->
 <div mat-dialog-content>
   <!-- TODO: #10. Control focus with FocusTrap -->
-  <mat-selection-list #colors aria-label="Dumpling wrapper color" multiple="false">
+  <mat-selection-list #colors aria-label="Dumpling wrapper color" multiple="false" cdkFocusInitial>
     <mat-list-option *ngFor="let paint of defaultColors" [value]="paint" color="primary">
       <div class="color-option">
         <div class="circle" [ngStyle]="{'background': paint}"></div>