diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/umb-block-list-property-editor.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/umb-block-list-property-editor.html
index fb94a00631..aa16e6e9a8 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/umb-block-list-property-editor.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/umb-block-list-property-editor.html
@@ -8,13 +8,11 @@
 
             <div ng-repeat="layout in vm.layout track by layout.$block.key">
 
-                <button
-                    type="button"
-                    class="btn-reset umb-block-list__block--create-button"
-                    ng-click="vm.showCreateDialog($index, $event)"
-                    ng-controller="Umbraco.PropertyEditors.BlockListPropertyEditor.CreateButtonController as inlineCreateButtonCtrl"
-                    ng-mousemove="inlineCreateButtonCtrl.onMouseMove($event)"
-                >
+                <button type="button"
+                        class="btn-reset umb-block-list__block--create-button"
+                        ng-click="vm.showCreateDialog($index, $event)"
+                        ng-controller="Umbraco.PropertyEditors.BlockListPropertyEditor.CreateButtonController as inlineCreateButtonCtrl"
+                        ng-mousemove="inlineCreateButtonCtrl.onMouseMove($event)">
                     <div class="__plus" ng-style="{'left':inlineCreateButtonCtrl.plusPosX}">+</div>
                 </button>
 
@@ -26,28 +24,29 @@
             </div>
         </div>
 
-        <button
-            ng-if="vm.loading !== true"
-            id="{{vm.model.alias}}"
-            type="button"
-            class="btn-reset umb-block-list__create-button umb-outline"
-            ng-class="{ '--disabled': vm.availableBlockTypes.length === 0 }"
-            ng-click="vm.showCreateDialog(vm.layout.length, $event)"
-        >
+        <button ng-if="vm.loading !== true"
+                id="{{vm.model.alias}}"
+                type="button"
+                class="btn-reset umb-block-list__create-button umb-outline"
+                ng-class="{ '--disabled': vm.availableBlockTypes.length === 0 }"
+                ng-click="vm.showCreateDialog(vm.layout.length, $event)">
             <localize key="grid_addElement"></localize>
         </button>
 
-        <input type="hidden" name="minCount" ng-model="vm.layout" />
-        <input type="hidden" name="maxCount" ng-model="vm.layout" />
+        <input type="hidden" name="minCount" ng-model="vm.layout" val-server="minCount" />
+        <input type="hidden" name="maxCount" ng-model="vm.layout" val-server="maxCount" />
+
         <div ng-messages="vm.propertyForm.minCount.$error" show-validation-on-submit>
             <div class="help text-error" ng-message="minCount">
                 <localize key="validation_entriesShort" tokens="[vm.validationLimit.min, vm.validationLimit.min - vm.layout.length]" watch-tokens="true">Minimum %0% entries, needs <strong>%1%</strong> more.</localize>
             </div>
+            <span class="help-inline" ng-message="valServer" ng-bind-html="vm.propertyForm.minCount.errorMsg">></span>
         </div>
-        <div ng-if="vm.propertyForm.maxCount.$error === true && vm.layout.length > vm.validationLimit.max">
-            <div class="help text-error">
+        <div ng-messages="vm.propertyForm.maxCount.$error" show-validation-on-submit>
+            <div class="help text-error" ng-message="maxCount">
                 <localize key="validation_entriesExceed" tokens="[vm.validationLimit.max, vm.layout.length - vm.validationLimit.max]" watch-tokens="true">Maximum %0% entries, <strong>%1%</strong> too many.</localize>
             </div>
+            <span class="help-inline" ng-message="valServer" ng-bind-html="vm.propertyForm.maxCount.errorMsg"></span>
         </div>
 
     </div>
diff --git a/src/Umbraco.Web/PropertyEditors/BlockEditorPropertyEditor.cs b/src/Umbraco.Web/PropertyEditors/BlockEditorPropertyEditor.cs
index 9536d08439..a9dcd6b68b 100644
--- a/src/Umbraco.Web/PropertyEditors/BlockEditorPropertyEditor.cs
+++ b/src/Umbraco.Web/PropertyEditors/BlockEditorPropertyEditor.cs
@@ -2,7 +2,9 @@
 using Newtonsoft.Json.Linq;
 using System;
 using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
 using System.Linq;
+using System.Web.Razor.Parser.SyntaxTree;
 using Umbraco.Core;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Models;
@@ -59,6 +61,7 @@ namespace Umbraco.Web.PropertyEditors
                 _logger = logger;
                 _blockEditorValues = new BlockEditorValues(new BlockListEditorDataConverter(), contentTypeService, _logger);
                 Validators.Add(new BlockEditorValidator(_blockEditorValues, propertyEditors, dataTypeService, textService));
+                Validators.Add(new MinMaxValidator(_blockEditorValues, textService));
             }
 
             public IEnumerable<UmbracoEntityReference> GetReferences(object value)
@@ -221,6 +224,41 @@ namespace Umbraco.Web.PropertyEditors
             #endregion
         }
 
+        /// <summary>
+        /// Validates the min/max of the block editor
+        /// </summary>
+        private class MinMaxValidator : IValueValidator
+        {
+            private readonly BlockEditorValues _blockEditorValues;
+            private readonly ILocalizedTextService _textService;
+
+            public MinMaxValidator(BlockEditorValues blockEditorValues, ILocalizedTextService textService)
+            {
+                _blockEditorValues = blockEditorValues;
+                _textService = textService;
+            }
+
+            public IEnumerable<ValidationResult> Validate(object value, string valueType, object dataTypeConfiguration)
+            {
+                var blockConfig = (BlockListConfiguration)dataTypeConfiguration;
+                var blockEditorData = _blockEditorValues.DeserializeAndClean(value);
+                if ((blockEditorData == null && blockConfig?.ValidationLimit?.Min > 0)
+                    || (blockEditorData != null && blockEditorData.Layout.Count() < blockConfig?.ValidationLimit?.Min))
+                {
+                    yield return new ValidationResult(
+                        _textService.Localize("validation/entriesShort", new[] { blockConfig.ValidationLimit.Min.ToString(), (blockConfig.ValidationLimit.Min - blockEditorData.Layout.Count()).ToString() }),
+                        new[] { "minCount" });
+                }
+
+                if (blockEditorData != null && blockEditorData.Layout.Count() > blockConfig?.ValidationLimit?.Max)
+                {
+                    yield return new ValidationResult(
+                        _textService.Localize("validation/entriesExceed", new[] { blockConfig.ValidationLimit.Max.ToString(), (blockEditorData.Layout.Count() - blockConfig.ValidationLimit.Max).ToString() }),
+                        new[] { "maxCount" });
+                }
+            }
+        }
+
         internal class BlockEditorValidator : ComplexEditorValidator
         {
             private readonly BlockEditorValues _blockEditorValues;