diff --git a/client/core/src/components/autocomplete/autocomplete.html b/client/core/src/components/autocomplete/autocomplete.html
index 4d04f884f..7e6580d78 100755
--- a/client/core/src/components/autocomplete/autocomplete.html
+++ b/client/core/src/components/autocomplete/autocomplete.html
@@ -8,6 +8,7 @@
         </input>
         <div class="icons">
             <vn-icon
+                ng-show="!$ctrl.disabled"
                 icon="clear"
                 class="clear"
                 ng-click="$ctrl.onClearClick($event)"
diff --git a/client/core/src/components/autocomplete/autocomplete.js b/client/core/src/components/autocomplete/autocomplete.js
index 5c216d21d..98405710e 100755
--- a/client/core/src/components/autocomplete/autocomplete.js
+++ b/client/core/src/components/autocomplete/autocomplete.js
@@ -1,5 +1,5 @@
 import ngModule from '../../module';
-import Component from '../../lib/component';
+import Input from '../../lib/input';
 import './style.scss';
 
 /**
@@ -11,7 +11,7 @@ import './style.scss';
  * @property {Object} intialData A initial data to avoid the server request used to get the selection
  * @property {Boolean} multiple Wether to allow multiple selection
  */
-export default class Autocomplete extends Component {
+export default class Autocomplete extends Input {
     constructor($element, $scope, $http, $transclude) {
         super($element, $scope);
         this.$http = $http;
diff --git a/client/core/src/components/textfield/textfield.html b/client/core/src/components/textfield/textfield.html
index 7f39ccf64..57837cf09 100644
--- a/client/core/src/components/textfield/textfield.html
+++ b/client/core/src/components/textfield/textfield.html
@@ -20,7 +20,7 @@
             info_outline
         </i>
         <i class="material-icons pointer"
-            ng-show="$ctrl.hasValue && ($ctrl.hasFocus || $ctrl.hasMouseIn)"
+            ng-show="!$ctrl.disabled && $ctrl.hasValue && ($ctrl.hasFocus || $ctrl.hasMouseIn)"
             ng-click="$ctrl.clear()">
             clear
         </i>