diff --git a/addons/web_tip/static/src/js/tip.js b/addons/web_tip/static/src/js/tip.js
index 350062fc9a8..da2ac7f655e 100644
--- a/addons/web_tip/static/src/js/tip.js
+++ b/addons/web_tip/static/src/js/tip.js
@@ -90,6 +90,9 @@
             var model = formView.model;
             var type = formView.datarecord.type ? formView.datarecord.type : null;
             var mode = 'form';
+            formView.on('view_content_has_changed', self, function() {
+                self.eval_tip(null, model, mode, type);
+            });
             self.eval_tip(null, model, mode, type);
         },
 
@@ -136,7 +139,9 @@
         add_tip: function(tip) {
             var self = this;
             self.tip_mutex.exec(function() {
-                return $.when(self.do_tip(tip));
+                if (!tip.is_consumed) {
+                    return $.when(self.do_tip(tip));
+                }
             });
         },
 
@@ -175,8 +180,7 @@
                     return (overflow === 'auto' || overflow === 'scroll');
                 });
                 if (scroll) {
-                    var offset = self.$element.offset().top;
-                    $(scroll).scrollTop(offset);
+                    $(scroll).scrollTo(self.$element);
                 }
 
                 var _top = self.$element.offset().top -5;