diff --git a/addons/sales_team/static/src/js/sales_team_dashboard.js b/addons/sales_team/static/src/js/sales_team_dashboard.js
index 76982b2f57b..286803dd66d 100644
--- a/addons/sales_team/static/src/js/sales_team_dashboard.js
+++ b/addons/sales_team/static/src/js/sales_team_dashboard.js
@@ -31,7 +31,7 @@ var SalesTeamDashboardView = KanbanView.extend({
         var super_render = this._super;
         var self = this;
 
-        this.fetch_data().then(function(result){
+        return this.fetch_data().then(function(result){
             self.show_demo = result && result['nb_opportunities'] == 0;
 
             var sales_dashboard = QWeb.render('sales_team.SalesDashboard', {
@@ -86,18 +86,14 @@ var SalesTeamDashboardView = KanbanView.extend({
         if(isNaN(target_value)) {
             this.do_warn(_t("Wrong value entered!"), _t("Only Integer Value should be valid."));
         } else {
-            this.modify_target(target_name, target_value).then(function() {
-                self.render();
-            });
+            this._updated = new Model('crm.lead')
+                            .call('modify_target_sales_dashboard', [target_name, target_value])
+                            .then(function() {
+                                return self.render();
+                            });
         }
     },
 
-    modify_target: function(target_name, value){
-        return new Model('crm.lead')
-            .call('modify_target_sales_dashboard', [target_name, value])
-
-    },
-
     on_dashboard_target_clicked: function(ev){
         if (this.show_demo) {
             // The user is not allowed to modify the targets in demo mode
@@ -122,12 +118,15 @@ var SalesTeamDashboardView = KanbanView.extend({
         $input.on('blur', function(e) {
             self.on_change_input_target(e);
         });
-        $target.replaceWith($input);
-        $input.focus().select();
+
+        $.when(this._updated).then(function() {
+            $input.replaceAll(self.$('.o_target_to_set[name=' + target_name + ']')) // the target may have changed (re-rendering)
+                  .focus()
+                  .select();
+        });
     },
 
     render_monetary_field: function(value, currency_id) {
-
         var currency = session.get_currency(currency_id);
         var digits_precision = currency && currency.digits;
         value = formats.format_value(value || 0, {type: "float", digits: digits_precision});
diff --git a/addons/sales_team/static/src/less/sales_team_dashboard.less b/addons/sales_team/static/src/less/sales_team_dashboard.less
index 96a67c0a185..e4d527032ba 100644
--- a/addons/sales_team/static/src/less/sales_team_dashboard.less
+++ b/addons/sales_team/static/src/less/sales_team_dashboard.less
@@ -37,6 +37,7 @@
 
         > div {
             display: inline-block;
+            vertical-align: top;
             @media (min-width: @screen-sm-min) {
                 width: 50%;
             }
@@ -53,6 +54,8 @@
                     border-top: 1px solid @odoo-view-background-color;
                     width: 25%;
 
+                    height: 33px;
+
                     span {
                         display: inline;
                     }