diff --git a/libmscore/edit.cpp b/libmscore/edit.cpp
index 94643f1e771f1..9c3c5e0495061 100644
--- a/libmscore/edit.cpp
+++ b/libmscore/edit.cpp
@@ -2517,6 +2517,7 @@ void Score::checkSpanner(int startTick, int endTick)
                         if (s->tick2() > lastTick)
                               s->undoChangeProperty(P_ID::SPANNER_TICKS, lastTick - s->tick());
                         }
+                  s->computeEndElement();
                   }
             }
       for (auto s : sl)       // actually remove scheduled spanners
diff --git a/libmscore/hairpin.cpp b/libmscore/hairpin.cpp
index a9cd6799262f1..262ce731513de 100644
--- a/libmscore/hairpin.cpp
+++ b/libmscore/hairpin.cpp
@@ -106,7 +106,7 @@ void HairpinSegment::layout()
 
 void HairpinSegment::updateGrips(Grip* defaultGrip, QVector<QRectF>& grip) const
       {
-      *defaultGrip = Grip(2);
+      *defaultGrip = Grip::END;
 
       QPointF pp(pagePos());
       qreal _spatium = spatium();