diff --git a/src/plugins/condition/components/ConditionEdit.vue b/src/plugins/condition/components/ConditionEdit.vue
index 8b1276e458..4efa604b07 100644
--- a/src/plugins/condition/components/ConditionEdit.vue
+++ b/src/plugins/condition/components/ConditionEdit.vue
@@ -44,15 +44,26 @@
                                     >
                                 </span>
                             </li>
+                            <li>
+                                <label>Output</label>
+                                <span class="controls">
+                                    <select v-model="condition.output">
+                                        <option value="false">false</option>
+                                        <option value="true">true</option>
+                                    </select>
+                                </span>
+                            </li>
                             <li v-if="telemetryObject && telemetryMetadata">
                                 <label>when</label>
                                 <span class="controls">
                                     <select class="">
+                                        <option value="">- Select Telemetry -</option>
                                         <option :value="telemetryObject.key">{{ telemetryObject.name }}</option>
                                     </select>
                                 </span>
                                 <span class="controls">
                                     <select v-model="selectedMetaDataKey">
+                                        <option value="">- Select Field -</option>
                                         <option v-for="option in telemetryMetadata"
                                                 :key="option.key"
                                                 :value="option.key"
@@ -64,6 +75,7 @@
 
                                 <span class="controls">
                                     <select v-model="selectedOperationKey">
+                                        <option value="">- Select Comparison -</option>
                                         <option v-for="option in operations"
                                                 :key="option.name"
                                                 :value="option.name"
@@ -73,15 +85,6 @@
                                     </select>
                                 </span>
                             </li>
-                            <li>
-                                <label>Output</label>
-                                <span class="controls">
-                                    <select v-model="condition.output">
-                                        <option value="false">false</option>
-                                        <option value="true">true</option>
-                                    </select>
-                                </span>
-                            </li>
                         </ul>
                     </div>
                 </div>
diff --git a/src/plugins/condition/components/condition.scss b/src/plugins/condition/components/condition.scss
index 46b128b878..c61cddb47f 100644
--- a/src/plugins/condition/components/condition.scss
+++ b/src/plugins/condition/components/condition.scss
@@ -82,6 +82,10 @@
     line-height: 20px;
 }
 
+.l-compact-form ul li .controls {
+    flex-grow: inherit;
+}
+
 .l-compact-form ul li .controls input[type="text"],
 .l-compact-form ul li .controls input[type="search"],
 .l-compact-form ul li .controls input[type="number"],