diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/includeproperties.prevalues.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/includeproperties.prevalues.html
index 0499bea713..c8f2a8050c 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/includeproperties.prevalues.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/includeproperties.prevalues.html
@@ -1,10 +1,12 @@
 <div class="umb-property-editor" ng-controller="Umbraco.PrevalueEditors.IncludePropertiesListViewController">
     <div class="control-group">
-
         <select ng-model="selectedField" ng-change="changeField()" val-highlight="{{hasError}}">
-            <option ng-repeat="field in systemFields" value="_system_{{field.value}}" ng-bind="field.name"></option>
-            <option class="select-dash" disabled="disabled">----</option>
-            <option ng-repeat="alias in propertyAliases" value="{{alias}}" ng-bind="alias"></option>
+            <optgroup label="System Fields">
+                <option ng-repeat="field in systemFields" value="_system_{{field.value}}" ng-bind="field.name"></option>
+            </optgroup>
+            <optgroup label="Custom Fields">
+                <option ng-repeat="alias in propertyAliases" value="{{alias}}" ng-bind="alias"></option>
+            </optgroup>
         </select>
         <button type="button" class="btn" ng-click="addField()">
             <localize key="general_add">Add</localize>
@@ -29,8 +31,7 @@
                     </td>
                     <td>
                        <div class="list-view-layout__name flex-column content-start">
-                            <span class="list-view-layout__name-text" ng-if="!val.isSystem" ng-bind="val.alias"></span>
-                            <span class="list-view-layout__name-text" ng-if="val.isSystem == 1" ng-bind="val.alias"></span>
+                            <span class="list-view-layout__name-text" ng-bind="val.alias"></span>
                             <span class="list-view-layout__system" ng-show="val.isSystem == 1">(system field)</span>
                        </div>
                     </td>