diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/editors/umbAutoFocus.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/editors/umbAutoFocus.directive.js
index bf415ff25d..bb65e94593 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/editors/umbAutoFocus.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/editors/umbAutoFocus.directive.js
@@ -4,7 +4,7 @@ angular.module("umbraco.directives")
         return function(scope, element, attr){
             var update = function() {
                 //if it uses its default naming
-                if(element.val() === ""){
+                if(element.val() === "" || attr.focusOnFilled){
                     element.focus();
                 }
             };