diff --git a/example/forms/src/ExampleFormController.js b/example/forms/src/ExampleFormController.js
index 99af83456e..5534d26459 100644
--- a/example/forms/src/ExampleFormController.js
+++ b/example/forms/src/ExampleFormController.js
@@ -1,4 +1,4 @@
-/*global define*/
+/*global define,window*/
 
 define(
     [],
@@ -21,6 +21,7 @@ define(
                                 description: "X coordinate",
                                 control: "textfield",
                                 pattern: "^\\d+$",
+                                disabled: true,
                                 size: 2,
                                 key: "x"
                             },
diff --git a/platform/forms/res/templates/controls/button.html b/platform/forms/res/templates/controls/button.html
index 879dd22ce7..730a67dd8b 100644
--- a/platform/forms/res/templates/controls/button.html
+++ b/platform/forms/res/templates/controls/button.html
@@ -1,6 +1,6 @@
 <a href=""
    class="t-btn l-btn s-btn s-icon-btn s-very-subtle"
-   ng-class="{ labeled: structure.text, disabled: structure.disabled }"
+   ng-class="{ labeled: structure.text }"
    ng-click="structure.click()">
     <span class="ui-symbol icon">
         {{structure.glyph}}
diff --git a/platform/forms/res/templates/toolbar.html b/platform/forms/res/templates/toolbar.html
index 49ac754421..17602268d8 100644
--- a/platform/forms/res/templates/toolbar.html
+++ b/platform/forms/res/templates/toolbar.html
@@ -15,9 +15,10 @@
                 {{item.name}}:
             </label>
             <mct-control key="item.control"
+                         ng-class="{ disabled: item.disabled }"
                          ng-model="ngModel"
                          ng-required="item.required"
-                         ng-pattern="getRegExp(row.pattern)"
+                         ng-pattern="getRegExp(item.pattern)"
                          options="item.options"
                          structure="item"
                          field="item.key">