Merge branch 'master' into alyssa-starter

1 files changed, 7 insertions, 5 deletions

diff --git a/src/client/views/nodes/formattedText/DashFieldView.tsx b/src/client/views/nodes/formattedText/DashFieldView.tsx
index ec0b76aa8..b49e7dcf0 100644
--- a/src/client/views/nodes/formattedText/DashFieldView.tsx
+++ b/src/client/views/nodes/formattedText/DashFieldView.tsx
@@ -210,11 +210,13 @@ export class DashFieldViewInternal extends ObservableReactComponent<IDashFieldVi
                     </span>
                 )}
                 {this._props.fieldKey.startsWith('#') ? null : this.fieldValueContent}
-                <select onChange={this.selectVal} style={{ height: '10px', width: '15px', fontSize: '12px', background: 'transparent' }}>
-                    {this.values.map(val => (
-                        <option value={val.value}>{val.label}</option>
-                    ))}
-                </select>
+                {!this.values.length ? null : (
+                    <select onChange={this.selectVal} style={{ height: '10px', width: '15px', fontSize: '12px', background: 'transparent' }}>
+                        {this.values.map(val => (
+                            <option value={val.value}>{val.label}</option>
+                        ))}
+                    </select>
+                )}
             </div>
         );
     }