diff --git a/src/sunstone/public/app/utils/range-slider.js b/src/sunstone/public/app/utils/range-slider.js
index 0e4fff373f..9be47ea14e 100644
--- a/src/sunstone/public/app/utils/range-slider.js
+++ b/src/sunstone/public/app/utils/range-slider.js
@@ -54,7 +54,7 @@ define(function(require) {
         tick_val += opts.tick_size;
       }
     }
-
+    
     sliderId += 1;
     return TemplateHTML(opts);
   }
@@ -62,7 +62,10 @@ define(function(require) {
   function _initialSetup() {
     $(document).off("input", "input.uinput-slider-val");
     $(document).on("input", "input.uinput-slider-val", function(){
+      var max = $("input[type=number]", $(this).closest('.uinput-slider-container')).attr('max');
       $("input[type=range]", $(this).closest('.uinput-slider-container')).val( this.value );
+      if(this.value > max)
+        $("input[type=number]", $(this).closest('.uinput-slider-container')).val(max);
     });
 
     $(document).off("input", "input.uinput-slider");