diff --git a/src/js/modules/infragistics.ui.editors.js b/src/js/modules/infragistics.ui.editors.js
index 0052d3de2..ade2929de 100644
--- a/src/js/modules/infragistics.ui.editors.js
+++ b/src/js/modules/infragistics.ui.editors.js
@@ -2347,11 +2347,11 @@
 				this._clearButton.removeClass(this.css.disabled);
 				this._attachButtonsEvents("clear", this._clearButton);
 			}
-			if (this._spinUpButton) {
+			if (this._spinUpButton && this.options.value !== this.options.maxValue) {
 				this._spinUpButton.removeClass(this.css.disabled);
 				this._attachButtonsEvents("spinUp", this._spinUpButton);
 			}
-			if (this._spinDownButton) {
+			if (this._spinDownButton && this.options.value !== this.options.minValue) {
 				this._spinDownButton.removeClass(this.css.disabled);
 				this._attachButtonsEvents("spinDown", this._spinDownButton);
 			}